Merge branch 'develop' into marchcat/xcode-16

1 files changed, 4 insertions, 0 deletions

diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index d5bf189d82..99c98f63ed 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -28,6 +28,7 @@
 // Dependencies
 #include "linden_common.h"
 #include "llapr.h"
+#include "llcontrol.h"      // LLControlGroup
 #include "llsingleton.h"
 #include "lltrans.h"
 #include "lluistring.h"
@@ -71,6 +72,8 @@ void LLUIString::updateResult() const { }
 void LLUIString::setArg(const std::string& , const std::string& ) { }
 void LLUIString::assign(const std::string& ) { }
 
+LLControlGroup gSavedSettings("Global");    // saved at end of session
+
 // End Stubbing
 // -------------------------------------------------------------------------------------------
 
@@ -131,6 +134,7 @@ namespace tut
         // Constructor and destructor of the test wrapper
         worldmap_test()
         {
+            gSavedSettings.declareBOOL("Use24HourClock", true, "", LLControlVariable::PERSIST_NO);
             mWorld = LLWorldMap::getInstance();
         }
         ~worldmap_test()