summaryrefslogtreecommitdiff
path: root/indra/llui/llurlregistry.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-02-02 17:19:14 +0000
committerLynx Linden <lynx@lindenlab.com>2010-02-02 17:19:14 +0000
commite563a07659b74b2dca850834a44c3b92ff993b44 (patch)
tree00d888fdd800be481ab6662a601ce6642f8e715e /indra/llui/llurlregistry.cpp
parent4ad357ec70e15afdfe78816990cb23c7ba17619c (diff)
DEV-32540: Lots of object IM and SLurl improvements
- Don't let object names that are URLs override links to display the remote object inspector - Don't hyperlink the object name in the remote object inspector - Made the <nolink>...</nolink> regex more robust and made it support non-URLs between the tags, so that we don't get random <nolink> tags when trying to disable URLs in user-typed text. - Improved the llurlentry unit test and added some more test cases. - Hooked up another LLViewerMessage code path to objectim SLapps to pass down the owner and slurl information. - Made a few LLUrlEntryBase methods be const methods, because they are - Fixed a bug in the remote object inspector where it would never show the teleport URL.
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
-rw-r--r--indra/llui/llurlregistry.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 55eb8950e9..722dbe41b3 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -132,7 +132,8 @@ static bool stringHasUrl(const std::string &text)
text.find(".com") != std::string::npos ||
text.find(".net") != std::string::npos ||
text.find(".edu") != std::string::npos ||
- text.find(".org") != std::string::npos);
+ text.find(".org") != std::string::npos ||
+ text.find("<nolink>") != std::string::npos);
}
bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LLUrlLabelCallback &cb)