diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-05-13 15:56:34 +0300 |
commit | bef3172ed989da5aed11eb1d8e51c071386d843c (patch) | |
tree | ba214e92afbf7fe241e9b2512a04ab62c0861f46 /indra/llcommon/lluri.cpp | |
parent | 059a71423019b6a38c41e2dae6d3e879aa893beb (diff) | |
parent | 3040d68c2637084176bdae759a89e264b1a3e14e (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) != "//") { |