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/llfloaterdaycycle.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/llfloaterdaycycle.cpp')
| -rw-r--r-- | indra/newview/llfloaterdaycycle.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 48f91aa64a..c54540d827 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -58,7 +58,7 @@ #include "llwlparammanager.h" #include "llpostprocess.h" #include "llfloaterwindlight.h" -#include "llwindlightscrubbers.h" +//#include "llwindlightscrubbers.h" // *HACK commented out since this code isn't released (yet) #include "llenvmanager.h" #include "llfloaterreg.h" @@ -73,8 +73,9 @@ LLFloaterDayCycle::LLFloaterDayCycle(const LLSD &key) : LLFloater(key) { sOriginalTitle = getTitle(); - llassert(LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue() && - LLWLPacketScrubber::MAX_REGION_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue()); + // *HACK commented out since this code isn't released (yet) + //llassert(LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue() && + // LLWLPacketScrubber::MAX_REGION_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxValue()); // add the time slider LLMultiSliderCtrl* sldr = getChild<LLMultiSliderCtrl>("WLTimeSlider"); @@ -530,10 +531,10 @@ void LLFloaterDayCycle::onAddKey(void* userData) switch(sScope) { case LLEnvKey::SCOPE_LOCAL: - max_sliders = LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES; + max_sliders = 20; // *HACK this should be LLWLPacketScrubber::MAX_LOCAL_KEY_FRAMES; break; case LLEnvKey::SCOPE_REGION: - max_sliders = LLWLPacketScrubber::MAX_REGION_KEY_FRAMES; + max_sliders = 12; // *HACK this should be LLWLPacketScrubber::MAX_REGION_KEY_FRAMES; break; default: max_sliders = (S32)kSldr->getMaxValue(); |