DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen

to resolve conflicts in installer_template.nsi

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
index a8e012bfa1..a3a8247268 100644
--- a/indra/newview/llslurl.cpp
+++ b/indra/newview/llslurl.cpp
@@ -172,11 +172,18 @@ LLSLURL::LLSLURL(const std::string& slurl)
 		    }
 			else
 		    {
-				// it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
+				if(slurl_uri.hostName() == LLSLURL::SLURL_APP_PATH)
+                {
+                    mType = APP;
+                }
+                else
+                {
+                    // it wasn't a /secondlife/<region> or /app/<params>, so it must be secondlife://<region>
 				// therefore the hostname will be the region name, and it's a location type
 				mType = LOCATION;
 				// 'normalize' it so the region name is in fact the head of the path_array
 				path_array.insert(0, slurl_uri.hostName());
+                }
 		    }
 		}
 		else if((slurl_uri.scheme() == LLSLURL::SLURL_HTTP_SCHEME) ||