STORM-793 Offered URL-like named object is displayed as a HTTP URL in the llGiveInventory


Submitter:	Vadim ProductEngine	Reviewers
Branch:		Groups:	viewer
Bugs:	STORM-793	People:
Change Number:	None	Repository:	viewer-development

Description:

Disallowed parsing HTTP URLs in llGiveInventory notifications (one more case).

The fix may look weird because we seem to wrap a SLURL with <nolink>...</nolink> tags.
But actually there is no SLURL, there's just an object name.
Investigating that goes beyond the bug scope.

Testing Done:

Expand All

indra/newview/skins/default/xui/en/notifications.xml (Diff revision 1)

Shouldn't the same change be made in the translations?

Vadim ProductEngine Aug. 16, 2011, 1:20 p.m. (Aug. 16, 2011, 1:20 p.m.)
```
Ah, right. Thanks, will fix.
```

> The fix may look weird because we seem to wrap a SLURL with <nolink>...</nolink> tags.
> But actually there is no SLURL, there's just an object name.

If that is so (and the comment on indra/newview/llviewermessage.cpp line 1941 indicates it is), why not rename the placeholder to ITEM_NAME or similar? I think the only places where this change would have to be made are llviewermessage.cpp line 1942, the message above and its translations.

Vadim ProductEngine Aug. 16, 2011, 1:24 p.m. (Aug. 16, 2011, 1:24 p.m.)

Because there *is* a SLURL being passed via ITEM_SLURL (see llviewermessage.cpp:1934). It's just becomes a plain name on its way.
So if we simply rename ITEM_SLURL to ITEM_NAME, we'll just hide the bug.

Diff
- added Diff r2

Description:

Applied the fix to translations and to the minimal (basic viewer) skin.

Looks good now.

You have a pending review.

Other reviews

Your comment

Review Board 1.6.11

This change has been marked as submitted.