diff options
| author | James Cook <james@lindenlab.com> | 2010-05-11 16:11:09 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-11 16:11:09 -0700 |
| commit | 2b7153c26a6dd5284218253910f466a0faeff708 (patch) | |
| tree | 8b8f54545c540d4e5f28d4a91215280117f52dff /indra/llui/llurlregistry.cpp | |
| parent | bae06b4b62587bd567495e3940a323e4c635a63e (diff) | |
| parent | 8e1dbbbb5628eee210a0a7c25f32287d7b754a8b (diff) | |
merge from dessie/viewer-public right before SLE code landed
Diffstat (limited to 'indra/llui/llurlregistry.cpp')
| -rw-r--r-- | indra/llui/llurlregistry.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp index 3fadf3dd11..7a866f44c2 100644 --- a/indra/llui/llurlregistry.cpp +++ b/indra/llui/llurlregistry.cpp @@ -47,6 +47,7 @@ LLUrlRegistry::LLUrlRegistry() // Urls are matched in the order that they were registered registerUrl(new LLUrlEntryNoLink()); + registerUrl(new LLUrlEntryIcon()); registerUrl(new LLUrlEntrySLURL()); registerUrl(new LLUrlEntryHTTP()); registerUrl(new LLUrlEntryHTTPLabel()); @@ -55,8 +56,10 @@ LLUrlRegistry::LLUrlRegistry() registerUrl(new LLUrlEntryParcel()); registerUrl(new LLUrlEntryTeleport()); registerUrl(new LLUrlEntryWorldMap()); + registerUrl(new LLUrlEntryObjectIM()); registerUrl(new LLUrlEntryPlace()); registerUrl(new LLUrlEntryInventory()); + registerUrl(new LLUrlEntryObjectIM()); //LLUrlEntrySL and LLUrlEntrySLLabel have more common pattern, //so it should be registered in the end of list registerUrl(new LLUrlEntrySL()); @@ -138,7 +141,8 @@ static bool stringHasUrl(const std::string &text) text.find(".net") != std::string::npos || text.find(".edu") != std::string::npos || text.find(".org") != std::string::npos || - text.find("<nolink>") != std::string::npos); + text.find("<nolink>") != std::string::npos || + text.find("<icon") != std::string::npos); } bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LLUrlLabelCallback &cb) |