summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluriparser.cpp
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-03-27 11:23:58 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-03-27 11:23:58 +0200
commitb10940e8e38db7c7fc4adbd73ad8a56dec2b58f3 (patch)
treefc2c8cd6c5eafcad70df692233f21f210bde2b03 /indra/llcommon/lluriparser.cpp
parentbd3ee81e8d7f739b0ff733f19e3922ce03433be4 (diff)
MAINT-5019 FIXED Undesired http:// added to domains sent in chat
Diffstat (limited to 'indra/llcommon/lluriparser.cpp')
-rw-r--r--indra/llcommon/lluriparser.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index 08b19c56e0..e24e53426e 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -29,7 +29,7 @@
#include "linden_common.h"
#include "lluriparser.h"
-LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mRes(0)
+LLUriParser::LLUriParser(const std::string& u) : mTmpScheme(false), mNormalizedTmp(false), mRes(0)
{
mState.uri = &mUri;
@@ -140,7 +140,7 @@ void LLUriParser::extractParts()
return;
}
- if (mTmpScheme)
+ if (mTmpScheme || mNormalizedTmp)
{
mScheme.clear();
}
@@ -169,6 +169,7 @@ void LLUriParser::extractParts()
S32 LLUriParser::normalize()
{
+ mNormalizedTmp = mTmpScheme;
if (!mRes)
{
mRes = uriNormalizeSyntaxExA(&mUri, URI_NORMALIZE_SCHEME | URI_NORMALIZE_HOST);