diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-10-28 23:03:09 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-10-28 23:03:09 +0300 |
| commit | f3d4643b5907dec71183e4f0927c0e5a6fc48c70 (patch) | |
| tree | 19e691f863642d086705fb1dd7e6a40d24ea151f /indra/llui | |
| parent | d42b1c3b215e8e30975c287de935830efd1e4d0d (diff) | |
STORM-489 FIXED <nolink>'ed text rendered as URL
Changes:
* Suppressed URLs in object (sender) names of nearby chat messages loaded from history.
* Fixed text between <nolink>...</nolink> text being rendered as URL
(hand cursor on hover, context menu, context menu, opening Places SP on click).
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 3 |
1 files changed, 2 insertions, 1 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); } |