summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluri.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-04-06 11:54:32 +0300
commit3da3ed2ccb9bab68be113bf7a79e6f95f7b73f9e (patch)
tree76bf2106cbbed09e02340b9cb0fa2fdee422b725 /indra/llcommon/lluri.cpp
parent9dcdbf029c3a74de5aefca52262d4ed41626298d (diff)
parentcf94709c60949d5376f8c5dc14bf5472631cd6c9 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/llcommon/lluri.cpp')
-rw-r--r--indra/llcommon/lluri.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp
index 9d4f3a98f0..0e8f3f0f73 100644
--- a/indra/llcommon/lluri.cpp
+++ b/indra/llcommon/lluri.cpp
@@ -231,7 +231,8 @@ static BOOL isDefault(const std::string& scheme, U16 port)
void LLURI::parseAuthorityAndPathUsingOpaque()
{
if (mScheme == "http" || mScheme == "https" ||
- mScheme == "ftp" || mScheme == "secondlife" )
+ mScheme == "ftp" || mScheme == "secondlife" ||
+ mScheme == "x-grid-location-info")
{
if (mEscapedOpaque.substr(0,2) != "//")
{