diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-06 11:54:32 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-06 11:54:32 +0300 |
commit | 3da3ed2ccb9bab68be113bf7a79e6f95f7b73f9e (patch) | |
tree | 76bf2106cbbed09e02340b9cb0fa2fdee422b725 /indra/llcommon/lluri.cpp | |
parent | 9dcdbf029c3a74de5aefca52262d4ed41626298d (diff) | |
parent | cf94709c60949d5376f8c5dc14bf5472631cd6c9 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/lluri.cpp')
-rw-r--r-- | indra/llcommon/lluri.cpp | 3 |
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) != "//") { |