summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-10-15 09:52:11 +0100
committerTofu Buzzard <no-email>2010-10-15 09:52:11 +0100
commitad033a4b35387a343f2204cda64ecb590888b60e (patch)
tree6b2191d8e082bc84e28b2bbaa4dcea95cf68a797 /indra/newview/llchatitemscontainerctrl.cpp
parent393c819477b268aa0a05ec0a006e1dba27d6e6c6 (diff)
parent508686047d5e98934d5fefbb576e54f108df6fe3 (diff)
sync up to viewer-developer
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp4
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+=" ";