From 4971d940b24f35993c8225504da4fbac0da9e85d Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 15 Jan 2014 22:31:03 +0100
Subject: [PATCH] FIRE-6238: objectim SLURLs don't get handled correctly if the
 object's name contains ampersands

---
 indra/newview/llurldispatcher.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 3137a3bc33..4ec393b855 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -152,7 +152,11 @@ bool LLURLDispatcherImpl::dispatchApp(const LLSLURL& slurl,
 									  bool trusted_browser)
 {
 	llinfos << "cmd: " << slurl.getAppCmd() << " path: " << slurl.getAppPath() << " query: " << slurl.getAppQuery() << llendl;
-	const LLSD& query_map = LLURI::queryMap(slurl.getAppQuery());
+
+	// <FS:Ansariel> FIRE-6238: Don't try to parse an already unescaped query string - use the already created query map!
+	//const LLSD& query_map = LLURI::queryMap(slurl.getAppQuery());
+	const LLSD& query_map = slurl.getAppQueryMap();
+	// </FS:Ansariel>
 
 // <FS:AW handle hop app teleports properly>
 // 	bool handled = LLCommandDispatcher::dispatch(