summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-10-28 16:06:53 -0700
committerMerov Linden <merov@lindenlab.com>2010-10-28 16:06:53 -0700
commit8209e35643cd21bde2b52bfa26cd77732f4fca9f (patch)
tree8ddcbfa27d5b708ad5dfa4ebb43172da21dcef80 /indra/llui
parent49b39c7edf5c9381e5adb04823a000f378a7f063 (diff)
parentf3d4643b5907dec71183e4f0927c0e5a6fc48c70 (diff)
STORM-488 : merge with viewer-development
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llurlentry.cpp3
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);
}