From 0741b359381f87cda9e4d8e14a8dbe99457fb1e0 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 12 Feb 2014 16:55:48 +0100
Subject: [PATCH] FIRE-11586: More hammering on SLURLs; Restore grid manager
 workaround (the actual start SLURL is set in LLStartup in idle_startup() with
 state = STATE_AUDIO_INIT)

---
 indra/newview/fsslurl.cpp     |  1 +
 indra/newview/llappviewer.cpp | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/indra/newview/fsslurl.cpp b/indra/newview/fsslurl.cpp
index c093739b38..dbd9b52cc4 100644
--- a/indra/newview/fsslurl.cpp
+++ b/indra/newview/fsslurl.cpp
@@ -144,6 +144,7 @@ LLSLURL::LLSLURL(const std::string& slurl)
 		// default to current
 		std::string default_grid = LLGridManager::getInstance()->getGrid();
 		mGrid = default_grid;
+		LL_DEBUGS("SLURL") << "default grid: " << default_grid << LL_ENDL;
 
 		if(slurl_uri.scheme() == LLSLURL::SLURL_SECONDLIFE_SCHEME)
 		{
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 53a1f4549a..e69198907b 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3125,11 +3125,14 @@ bool LLAppViewer::initConfiguration()
 	if(! CmdLineLoginLocation.empty())
     {
 		start_slurl = CmdLineLoginLocation;
-		LLStartUp::setStartSLURL(start_slurl);
-		if(start_slurl.getType() == LLSLURL::LOCATION) 
-		{  
-			LLGridManager::getInstance()->setGridChoice(start_slurl.getGrid());
-    }
+		// <FS:Ansariel> FIRE-11586: Restore grid manager workaround (grid is still empty here!)
+		//LLStartUp::setStartSLURL(start_slurl);
+		//if(start_slurl.getType() == LLSLURL::LOCATION) 
+		//{  
+		//	LLGridManager::getInstance()->setGridChoice(start_slurl.getGrid());
+  //  }
+		LLStartUp::setStartSLURLString(CmdLineLoginLocation);
+		// </FS:Ansariel>
     }
 
 	// <FS:TT> Hacking to save the skin and theme for future use.