merge changes for 3.8.3-release

2 files changed, 40 insertions, 1 deletions

diff --git a/indra/newview/tests/llslurl_test.cpp b/indra/newview/tests/llslurl_test.cpp
index 2bc0d5a086..4694f657b6 100755
--- a/indra/newview/tests/llslurl_test.cpp
+++ b/indra/newview/tests/llslurl_test.cpp
@@ -39,7 +39,21 @@ namespace
 static const char * const TEST_FILENAME("llslurl_test.xml");
 
 }
-	
+
+//
+// Stub implementation for LLTrans
+//
+class LLTrans
+{
+public:
+	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+};
+
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+	return std::string();
+}
+
 //----------------------------------------------------------------------------
 // Mock objects for the dependencies of the code we're testing
 
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index 0eb0ab6500..e68da14fe9 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -38,6 +38,31 @@ namespace
 static const char * const TEST_FILENAME("llviewernetwork_test.xml");
 
 }
+
+//
+// Stub implementation for LLTrans
+//
+class LLTrans
+{
+public:
+	static std::string getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args);
+};
+
+std::string LLTrans::getString(const std::string &xml_desc, const LLStringUtil::format_map_t& args)
+{
+	std::string grid_label = std::string();
+	if(xml_desc == "AgniGridLabel")
+	{
+		grid_label = "Second Life Main Grid (Agni)";
+	}
+	else if(xml_desc == "AditiGridLabel")
+	{
+		grid_label = "Second Life Beta Test Grid (Aditi)";
+	}
+
+	return grid_label;
+}
+
 //----------------------------------------------------------------------------
 // Mock objects for the dependencies of the code we're testing