Allow overriding SYSTEM_FROM for other grids

indra/llmessage/llinstantmessage.cpp

@@ -46,7 +46,7 @@ const U8 IM_OFFLINE = 1;
 const char EMPTY_BINARY_BUCKET[] = "";
 const S32 EMPTY_BINARY_BUCKET_SIZE = 1;
 const U32 NO_TIMESTAMP = 0;
-const std::string SYSTEM_FROM("Second Life");
+std::string SYSTEM_FROM("Second Life");
 const std::string INTERACTIVE_SYSTEM_FROM("F387446C-37C4-45f2-A438-D99CBDBB563B");
 const S32 IM_TTL = 1;
 

indra/llmessage/llinstantmessage.h

@@ -171,7 +171,7 @@ extern const char EMPTY_BINARY_BUCKET[];
 extern const S32 EMPTY_BINARY_BUCKET_SIZE;
 
 extern const U32 NO_TIMESTAMP;
-extern const std::string SYSTEM_FROM;
+extern std::string SYSTEM_FROM;
 extern const std::string INTERACTIVE_SYSTEM_FROM;
 
 // Number of retry attempts on sending the im.

indra/newview/llviewernetwork.cpp

@@ -696,6 +696,14 @@ void LLGridManager::setGridChoice(const std::string& grid, const bool only_selec
 		gSavedSettings.setString("CurrentGrid", grid_name);
 		LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel());
 		LLTrans::setDefaultArg("GRID_ADMIN", getGridAdministrator());
+		if (isInSecondlife())
+		{
+			SYSTEM_FROM = "Second Life";
+		}
+		else
+		{
+			SYSTEM_FROM = "Grid";
+		}
 		
 		updateIsInProductionGrid();
 	}