Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

indra/newview/CMakeLists.txt

@@ -1770,8 +1770,8 @@ else (LL_TESTS)
     lldateutil.cpp
     llmediadataclient.cpp
     lllogininstance.cpp
+    llviewerhelputil.cpp
   )
-  # DISABLED TEST: llviewerhelputil.cpp /* not testing anything useful and hard to mock LLAgent dependency */
 
   ##################################################
   # DISABLING PRECOMPILED HEADERS USAGE FOR TESTS 

indra/newview/tests/llviewerhelputil_test.cpp

@@ -78,9 +78,21 @@ static void substitute_string(std::string &input, const std::string &search, con
 	}
 }
 
+class LLAgent
+{
+public:
+	LLAgent() {}
+	~LLAgent() {}
+	BOOL isGodlike() const { return FALSE; }
+private:
+	int dummy;
+};
+LLAgent gAgent;
+
 std::string LLWeb::expandURLSubstitutions(const std::string &url,
 										  const LLSD &default_subs)
 {
+	(void)gAgent.isGodlike(); // ref symbol to stop compiler from stripping it
 	std::string new_url = url;
 	substitute_string(new_url, "[TOPIC]", default_subs["TOPIC"].asString());
 	substitute_string(new_url, "[VERSION]", gVersion);
@@ -91,6 +103,7 @@ std::string LLWeb::expandURLSubstitutions(const std::string &url,
 	return new_url;
 }
 
+
 //----------------------------------------------------------------------------
 	
 namespace tut