summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-08-20 12:04:57 +0300
committerAndreyL ProductEngine <andreylproductengine@lindenlab.com>2015-08-20 12:04:57 +0300
commit41d2a60cba059539e708380f8964dea45a119546 (patch)
tree9ff1664948fa0a63a001d74546ae0d63484fbab4
parent0735380c60bb789aa8c1073699df8e473b083534 (diff)
MAINT-5533 FIXED The fragment part of an URI is only shown if it contains a query part as well.
fix by Ansariel
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/llcommon/lluriparser.cpp10
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 211d4fcf08..7493e96c39 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -185,6 +185,7 @@ Ansariel Hiller
BUG-3764
STORM-1984
STORM-1979
+ MAINT-5533
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/llcommon/lluriparser.cpp b/indra/llcommon/lluriparser.cpp
index d98bc297e5..82d0dc8b4b 100644
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@@ -238,12 +238,12 @@ void LLUriParser::glueSecond(std::string& uri) const
{
uri += '?';
uri += mQuery;
+ }
- if (mFragment.size())
- {
- uri += '#';
- uri += mFragment;
- }
+ if (mFragment.size())
+ {
+ uri += '#';
+ uri += mFragment;
}
}