summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-10-12 13:31:19 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2010-10-12 13:31:19 +0300
commitbf699333fa8defca3bf1f3ae346cd0ed5e94e2dd (patch)
tree35f47757fb5bc9a9a9f85e8427ab8fd33744c88c
parenta8fbfa40ba6153668e1f713ae0e128224b4f400f (diff)
STORM-358 FIXED Disabled higlighting URLs in object names inside nearby chat toasts.
-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+=" ";