summaryrefslogtreecommitdiff
path: root/indra/llcommon/lluriparser.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-08-10 13:31:25 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-08-10 13:31:25 +0300
commite76b5643effc0a38c28a561ce403c97033419398 (patch)
tree7b93264533ab4028aabdfa8a3a4c103285e87ec9 /indra/llcommon/lluriparser.cpp
parent5924155f29d9c971dcec4fd21e77466a455ef98d (diff)
MAINT-6608 FIXED URI parser problem with links with username, password
Diffstat (limited to 'indra/llcommon/lluriparser.cpp')
-rw-r--r--indra/llcommon/lluriparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index 82d0dc8b4b..c275b90120 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -205,9 +205,9 @@ void LLUriParser::glue(std::string& uri) const
uri = first_part + second_part;
}
-void LLUriParser::glueFirst(std::string& uri) const
+void LLUriParser::glueFirst(std::string& uri, bool use_scheme) const
{
- if (mScheme.size())
+ if (use_scheme && mScheme.size())
{
uri = mScheme;
uri += "://";