diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2010-04-02 17:24:44 +0300 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2010-04-02 17:24:44 +0300 |
| commit | 16b22d4abe99f8b43628db9db8142d65f431b062 (patch) | |
| tree | 079db718f06c6ed35267db5fe35b1dbd7f2de28f /indra/llcommon/lluri.cpp | |
| parent | f4f05ad4dfc1ae47ffad0c9e2d26c4123d7f42c1 (diff) | |
| parent | 7d38dd51c2a59d173bee9c04737002313f4b9dec (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) != "//") { |