diff options
author | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
---|---|---|
committer | tiggs@lindenlab.com <tiggs@lindenlab.com> | 2011-02-23 17:44:18 -0500 |
commit | 758fdbfe125d75bd2253a69337eab7fec7406ecf (patch) | |
tree | 4bead0bf6b11efc55d5eb91d2b3b25d44fdb5c31 /indra/newview/llwlparammanager.cpp | |
parent | 6bb02e0e260df2d00ab53376cf15af5e7e2fd12f (diff) |
STORM-1126 WIP Windlight Estate Settings port from 1.23: baseline: read only windlight works
(resubmitted by Vadim ProductEngine)
Diffstat (limited to 'indra/newview/llwlparammanager.cpp')
-rw-r--r-- | indra/newview/llwlparammanager.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 3070fed81f..2adf9f4a77 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -37,6 +37,7 @@ #include "pipeline.h" #include "llsky.h" +#include "llfloaterreg.h" #include "llsliderctrl.h" #include "llspinctrl.h" #include "llcheckboxctrl.h" @@ -57,6 +58,7 @@ #include "llenvmanager.h" #include "llwlparamset.h" #include "llpostprocess.h" + #include "llfloaterwindlight.h" #include "llfloaterdaycycle.h" #include "llfloaterenvsettings.h" @@ -523,17 +525,20 @@ void LLWLParamManager::update(LLViewerCamera * cam) propagateParameters(); // sync menus if they exist - if(LLFloaterWindLight::isOpen()) + LLFloaterWindLight* wlfloater = LLFloaterReg::findTypedInstance<LLFloaterWindLight>("env_windlight"); + if (wlfloater) { - LLFloaterWindLight::instance()->syncMenu(); + wlfloater->syncMenu(); } - if(LLFloaterDayCycle::isOpen()) + LLFloaterDayCycle* dlfloater = LLFloaterReg::findTypedInstance<LLFloaterDayCycle>("env_day_cycle"); + if (dlfloater) { - LLFloaterDayCycle::instance()->syncMenu(); + dlfloater->syncMenu(); } - if(LLFloaterEnvSettings::isOpen()) + LLFloaterEnvSettings* envfloater = LLFloaterReg::findTypedInstance<LLFloaterEnvSettings>("env_settings"); + if (envfloater) { - LLFloaterEnvSettings::instance()->syncMenu(); + envfloater->syncMenu(); } F32 camYaw = cam->getYaw(); |