diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-11-16 08:39:41 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2016-11-16 08:39:41 -0500 |
| commit | d31596db6a6c5f7ef8c57bfaa42496db4a9b471e (patch) | |
| tree | a107255826e044a4ef23ff6328e8468a39cb5995 /indra/llcommon/lluriparser.cpp | |
| parent | de487038fc034c470a21e9d6c5bf78e5085ae4a2 (diff) | |
| parent | ecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff) | |
merge
Diffstat (limited to 'indra/llcommon/lluriparser.cpp')
| -rw-r--r-- | indra/llcommon/lluriparser.cpp | 4 |
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 += "://"; |