diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-01 21:47:22 -0700 |
| commit | aa0a129b6798f8be554d1d9d41cbd217a0040daf (patch) | |
| tree | a206cf638fa4a8f48dd869e0ccf12b7b6a428972 /indra/llcommon/lluri.cpp | |
| parent | 98695056c2fbfb91de805d9e2a01cde23668c4d3 (diff) | |
| parent | 86dc5bce1a6fdde1238fea97ca1f6f8acb862184 (diff) | |
Automated Merge
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) != "//") { |