DEV-39188: Removed the custom support for secondlife:///app/events and

secondlife:///app/classifieds URLs because we do not have handlers for
these SLAPPs in 2.0.

Added support for secondlife://<location/<x>/<y>/<z> URLs, in addition
to the http://slurl.com SLURLs.

Also optimized LLUrlRegistry:findUrl() so that it avoids lots of
expensive regex calls when there is no URL in the text.

1 files changed, 3 insertions, 4 deletions

diff --git a/indra/llui/llurlregistry.cpp b/indra/llui/llurlregistry.cpp
index 938375ad13..f2d340deb7 100644
--- a/indra/llui/llurlregistry.cpp
+++ b/indra/llui/llurlregistry.cpp
@@ -49,11 +49,10 @@ LLUrlRegistry::LLUrlRegistry()
 	registerUrl(new LLUrlEntryHTTPLabel());
 	registerUrl(new LLUrlEntryAgent());
 	registerUrl(new LLUrlEntryGroup());
-	registerUrl(new LLUrlEntryEvent());
-	registerUrl(new LLUrlEntryClassified());
 	registerUrl(new LLUrlEntryParcel());
 	registerUrl(new LLUrlEntryTeleport());
 	registerUrl(new LLUrlEntryObjectIM());
+	registerUrl(new LLUrlEntryPlace());
 	registerUrl(new LLUrlEntrySL());
 	registerUrl(new LLUrlEntrySLLabel());
 }
@@ -118,8 +117,8 @@ static bool matchRegex(const char *text, boost::regex regex, U32 &start, U32 &en
 
 bool LLUrlRegistry::findUrl(const std::string &text, LLUrlMatch &match, const LLUrlLabelCallback &cb)
 {
-	// test for the trivial case of no text and get out fast
-	if (text.empty())
+	// avoid costly regexes if there is clearly no URL in the text
+	if (text.find("://") == std::string::npos)
 	{
 		return false;
 	}