diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-28 16:06:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-28 16:06:53 -0700 |
| commit | 8209e35643cd21bde2b52bfa26cd77732f4fca9f (patch) | |
| tree | 8ddcbfa27d5b708ad5dfa4ebb43172da21dcef80 /indra | |
| parent | 49b39c7edf5c9381e5adb04823a000f378a7f063 (diff) | |
| parent | f3d4643b5907dec71183e4f0927c0e5a6fc48c70 (diff) | |
STORM-488 : merge with viewer-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llchathistory.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index f49dfec82b..84678ef4db 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -989,7 +989,8 @@ std::string LLUrlEntryNoLink::getLabel(const std::string &url, const LLUrlLabelC LLStyle::Params LLUrlEntryNoLink::getStyle() const { - return LLStyle::Params(); + // Don't render as URL (i.e. no context menu or hand cursor). + return LLStyle::Params().is_link(false); } diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index cb5cf4a61d..3dc6e786d3 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -790,8 +790,9 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL // (don't let object names with hyperlinks override our objectim Url) LLStyle::Params link_params(style_params); link_params.color.control = "HTMLLinkColor"; + link_params.is_link = true; link_params.link_href = url; - mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter, + mEditor->appendText(chat.mFromName + delimiter, false, link_params); } else if ( chat.mFromName != SYSTEM_FROM && chat.mFromID.notNull() && !message_from_log) @@ -804,7 +805,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL } else { - mEditor->appendText(chat.mFromName + delimiter, false, style_params); + mEditor->appendText("<nolink>" + chat.mFromName + "</nolink>" + delimiter, false, style_params); } } } |