Merge recent changes

1 files changed, 3 insertions, 1 deletions

diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index 19cf9cd961..5af8acebaf 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -69,7 +69,6 @@ std::string LLViewerLogin::getGridLabel() const { return VIEWERLOGIN_GRIDLABEL;
 //-----------------------------------------------------------------------------

 #include "../llviewercontrol.h"

 LLControlGroup gSavedSettings("Global");

-LLControlGroup gSavedSkinSettings("Skinning");

 std::string gCurrentVersion = "invalid_version";

 

 LLControlGroup::LLControlGroup(const std::string& name) :

@@ -83,6 +82,9 @@ std::string LLControlGroup::getString(const std::string& name) { return "test_st
 BOOL LLControlGroup::declareBOOL(const std::string& name, BOOL initial_val, const std::string& comment, BOOL persist) { return TRUE; }

 BOOL LLControlGroup::declareString(const std::string& name, const std::string &initial_val, const std::string& comment, BOOL persist) { return TRUE; }

 

+#include "lluicolortable.h"

+void LLUIColorTable::saveUserSettings(void)const {}

+

 //-----------------------------------------------------------------------------

 #include "../llurlsimstring.h"

 LLURLSimString LLURLSimString::sInstance;