diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
| commit | 37dc96ccdde6263188ffc4f620492a4bb2017761 (patch) | |
| tree | a30a05b08a64d3e2e83d50f1488aac902d542501 /indra/llcommon/lluri.cpp | |
| parent | 4c03806be99d4cb0df55b345f4c758f39d7f8560 (diff) | |
| parent | 215ae1ed5d79f44549ade91f7e84134ab4589447 (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) != "//") { |