1 files changed, 23 insertions, 1 deletions

diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index b709bfc..e5dd328 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -35,7 +35,6 @@
 #include "lltut.h"
 #include "llsdserialize.h"
 #include "llfile.h"
-#include "lldir.h"
 #include "lltimer.h"
 #include "llframetimer.h"
 #include "llsdutil.h"
@@ -51,7 +50,11 @@ namespace tut
                         random.generate();
                         // generate temp dir
                         std::ostringstream oStr;
+#if LL_WINDOWS 
+                        oStr << "llmessage-config-test-" << random;
+#else
                         oStr << "/tmp/llmessage-config-test-" << random;
+#endif
                         mTestConfigDir = oStr.str();
                         LLFile::mkdir(mTestConfigDir.c_str());
                         writeConfigFile(LLSD());
@@ -199,4 +202,23 @@ namespace tut
                                           LLMessageConfig::getServerDefaultFlavor(),
                                           LLMessageConfig::LLSD_FLAVOR);
         }
+
+        template<> template<>
+        void LLMessageConfigTestObject::test<8>()
+                // tests that config changes are picked up/refreshed periodically
+        {
+                LLSD config;
+                config["serverDefaults"]["simulator"] = "template";
+                config["messages"]["msg1"]["flavor"] = "llsd";
+                config["messages"]["msg1"]["only-send-latest"] = true;
+                config["messages"]["msg2"]["flavor"] = "llsd";
+                config["messages"]["msg2"]["only-send-latest"] = false;
+                LLMessageConfig::useConfig(config);
+                ensure_equals("Ensure msg1 exists, sent latest-only",
+                                          LLMessageConfig::onlySendLatest("msg1"),
+                                          true);
+                ensure_equals("Ensure msg2 exists, sent latest-only",
+                                          LLMessageConfig::onlySendLatest("msg2"),
+                                          false);
+        }
 }