From c855c065cb4d5a3d79f6d4ec47a4b8a36c80d93d Mon Sep 17 00:00:00 2001
From: Armin Weatherwax <arminweatherwax@lavabit.com>
Date: Sat, 30 Jun 2012 17:57:51 +0200
Subject: [PATCH] make CURRENT_GRID a default substitution, fixes FIRE-2935

---
 indra/newview/fsgridhandler.cpp   | 3 ++-
 indra/newview/llappviewer.cpp     | 1 +
 indra/newview/llviewernetwork.cpp | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp
index 1f88217063..4b7325056b 100644
--- a/indra/newview/fsgridhandler.cpp
+++ b/indra/newview/fsgridhandler.cpp
@@ -1067,7 +1067,8 @@ void LLGridManager::setGridChoice(const std::string& grid)
 		LL_DEBUGS("GridManager")<< "setting grid choice: " << grid << LL_ENDL;
 		mGrid = grid;// AW: don't set mGrid anywhere else
 		getGridData(mConnectedGrid);
-		gSavedSettings.setString("CurrentGrid", grid); 
+		gSavedSettings.setString("CurrentGrid", grid);
+		LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel()); //<FS:AW make CURRENT_GRID a default substitution>
 		updateIsInProductionGrid();
 		mReadyToLogin = true;
 	}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 777c877885..f21e96a262 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -402,6 +402,7 @@ void init_default_trans_args()
 	default_trans_args.insert("SECOND_LIFE"); // World
 	default_trans_args.insert("APP_NAME");
 	default_trans_args.insert("CAPITALIZED_APP_NAME");
+	default_trans_args.insert("CURRENT_GRID"); //<FS:AW make CURRENT_GRID a default substitution>
 	default_trans_args.insert("SECOND_LIFE_GRID");
 	default_trans_args.insert("SUPPORT_SITE");
 }
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index c0ede2795c..6fd682c756 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -550,6 +550,7 @@ void LLGridManager::setGridChoice(const std::string& grid)
 	}
 	mGrid = grid;
 	gSavedSettings.setString("CurrentGrid", grid);
+	LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel()); //<FS:AW make CURRENT_GRID a default substitution>
 
 	updateIsInProductionGrid();
 }