Merge viewer-bear

2015-08-29 11:47:44 +02:00 · 2015-08-29 11:47:44 +02:00 · 3cd1736f3d
parent 5d2d2359e7 9c391b3dea
commit 3cd1736f3d
2 changed files with 6 additions and 5 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -186,6 +186,7 @@ Ansariel Hiller
 	STORM-1984
 	STORM-1979
 	STORM-2105
+	MAINT-5533
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
--- a/indra/llcommon/lluriparser.cpp
+++ b/indra/llcommon/lluriparser.cpp
@ -242,12 +242,12 @@ void LLUriParser::glueSecond(std::string& uri) const
 	{
 		uri += '?';
 		uri += mQuery;
+	}

-		if (mFragment.size())
-		{
-			uri += '#';
-			uri += mFragment;
-		}
+	if (mFragment.size())
+	{
+		uri += '#';
+		uri += mFragment;
 	}
 }