diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-13 14:59:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 14:59:29 -0400 |
| commit | 812713685550cd3643f37cf736551086b8a629c3 (patch) | |
| tree | 08f19c9ae40b3a5b01283e2d3a52f9ca71d54467 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 93d31d9bfea91d2d5917ea117cef18f82b2a668f (diff) | |
| parent | 7111a1b3d946d00924627956f249cc4e513dd55b (diff) | |
merge fix for STORM-304
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index e78bdbe25c..ababa71348 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -169,7 +169,9 @@ void LLNearbyChatToastPanel::init(LLSD& notification) { std::string str_sender; - str_sender = fromName; + str_sender = "<nolink>"; // disable parsing URLs in object names (STORM-358) + str_sender += fromName; + str_sender += "</nolink>"; str_sender+=" "; |