diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-26 17:34:39 -0800 |
| commit | 5352954eb65076d877cc74d4328620e910b93d1c (patch) | |
| tree | a8bf1c956c0de44a5ab7eb0a2a05d5e9ed29b751 /indra/newview/llslurl.cpp | |
| parent | 13d4257868451d1e3a5797bd02a0e6f749cc0836 (diff) | |
| parent | b1891e2982cc03ccd695eae82989d3e58695616c (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llslurl.cpp')
| -rw-r--r-- | indra/newview/llslurl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index 43c505fae6..be8d89fa52 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -43,7 +43,8 @@ const char* LLSLURL::SLURL_HTTP_SCHEME = "http"; const char* LLSLURL::SLURL_HTTPS_SCHEME = "https"; const char* LLSLURL::SLURL_SECONDLIFE_SCHEME = "secondlife"; const char* LLSLURL::SLURL_SECONDLIFE_PATH = "secondlife"; -const char* LLSLURL::SLURL_COM = "slurl.com"; +const char* LLSLURL::SLURL_COM = "slurl.com"; +const char* LLSLURL::MAPS_SECONDLIFE_COM = "maps.secondlife.com"; const char* LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME = "x-grid-location-info"; const char* LLSLURL::SLURL_APP_PATH = "app"; const char* LLSLURL::SLURL_REGION_PATH = "region"; @@ -181,7 +182,8 @@ LLSLURL::LLSLURL(const std::string& slurl) (slurl_uri.scheme() == LLSLURL::SLURL_X_GRID_LOCATION_INFO_SCHEME)) { // We're dealing with either a nebraska style slurl or slurl.com slurl - if (slurl_uri.hostName() == LLSLURL::SLURL_COM) + if ((slurl_uri.hostName() == LLSLURL::SLURL_COM) || + (slurl_uri.hostName() == LLSLURL::MAPS_SECONDLIFE_COM)) { // slurl.com implies maingrid mGrid = MAINGRID; |