diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-18 21:56:57 +0000 | 
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-18 21:56:57 +0000 | 
| commit | 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac (patch) | |
| tree | 551854f0a350f27132f0af273eaa7b3cd5cb5cdc /indra/test | |
| parent | 672a76d0ea08a0d0fc824e103ee4c4242b7e03ec (diff) | |
svn merge -r 82263:82563 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Sprinkle "--location" pixie dust into farm curl calls
QAR-387 - pull in fix for missing abuse report snapshots (asset-id --> asset_id) / DEV-11758
comment --> template comment tweak by yoz for postcards
QAR-351 - Event queuing modifications
DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
Rotating log_text_message is now part of the cron jobs
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/llmessageconfig_tut.cpp | 20 | 
1 files changed, 19 insertions, 1 deletions
| diff --git a/indra/test/llmessageconfig_tut.cpp b/indra/test/llmessageconfig_tut.cpp index df50d908c3..7bda48a0a8 100644 --- a/indra/test/llmessageconfig_tut.cpp +++ b/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" @@ -199,4 +198,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); +	}  } | 
