diff options
| author | Celierra Darling <none@none> | 2011-01-10 15:06:30 -0500 |
|---|---|---|
| committer | Celierra Darling <none@none> | 2011-01-10 15:06:30 -0500 |
| commit | 6bb02e0e260df2d00ab53376cf15af5e7e2fd12f (patch) | |
| tree | 223206995f774b659b2ef0c735fe681314e64c1e /indra/newview/llenvmanager.cpp | |
| parent | 2fb337bc12984f9abecfbc7f3918c372a7b5ac6c (diff) | |
STORM-1126 WIP Windlight Estate Settings port from 1.23: Various changes to allow compilation
(resubmitted by Vadim ProductEngine)
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
| -rw-r--r-- | indra/newview/llenvmanager.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index a257e4ea24..daf3f90234 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -44,7 +44,7 @@ #include "llwlparammanager.h" #include "llwaterparammanager.h" #include "llfloaterregioninfo.h" -#include "llwindlightscrubbers.h" +//#include "llwindlightscrubbers.h" // *HACK commented out since this code isn't released (yet) #include "llwlhandlers.h" #include "llnotifications.h" @@ -269,11 +269,16 @@ bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const updateUIFromEditability(); // Validate - std::set<std::string> empty_set; - LLWLPacketScrubber scrubber(scope, empty_set); - LLSD windlight_llsd = scrubber.scrub(unvalidated_content); + //std::set<std::string> empty_set; + //LLWLPacketScrubber scrubber(scope, empty_set); + //LLSD windlight_llsd = scrubber.scrub(unvalidated_content); - bool valid = windlight_llsd.isDefined(); // successful scrub + //bool valid = windlight_llsd.isDefined(); // successful scrub + + // *HACK - Don't have the validator, so just use content without validating. Should validate here for third-party grids. + LLSD windlight_llsd(unvalidated_content); + bool valid = true; + // end HACK mLastReceivedID = unvalidated_content[0]["messageID"].asUUID(); // if the message was valid, grab the UUID from it and save it for next outbound update message |