From b054b96d6afe7cd8be71669de76a1fb6cb8764f3 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 8 Nov 2013 19:28:00 +0100
Subject: [PATCH] FIRE-11586: Temporary fix for SLURLs until grid manager has
 been reworked

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

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b00ef6a3e8..a80b92c403 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3209,7 +3209,10 @@ bool LLAppViewer::initConfiguration()
 	if (start_slurl.isValid() &&
 		(gSavedSettings.getBOOL("SLURLPassToOtherInstance")))
 	{
-		if (sendURLToOtherInstance(start_slurl.getSLURLString()))
+		// <FS:Ansariel> FIRE-11586: Temporary fix until grid manager has been reworked
+		//if (sendURLToOtherInstance(start_slurl.getSLURLString()))
+		if (sendURLToOtherInstance(CmdLineLoginLocation))
+		// </FS:Ansariel>
 		{
 			// successfully handed off URL to existing instance, exit
 			return false;