From 758fdbfe125d75bd2253a69337eab7fec7406ecf Mon Sep 17 00:00:00 2001 From: "tiggs@lindenlab.com" Date: Wed, 23 Feb 2011 17:44:18 -0500 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: baseline: read only windlight works (resubmitted by Vadim ProductEngine) --- indra/newview/llfloaterwindlight.cpp | 44 ++++++++++-------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) (limited to 'indra/newview/llfloaterwindlight.cpp') diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index d5ba0befec..217c7bd7ec 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -70,6 +70,10 @@ std::string LLFloaterWindLight::sOriginalTitle; static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f; LLFloaterWindLight::LLFloaterWindLight(const LLSD &key) : LLFloater(key) +{ +} + +BOOL LLFloaterWindLight::postBuild() { sOriginalTitle = getTitle(); @@ -108,44 +112,16 @@ LLFloaterWindLight::LLFloaterWindLight(const LLSD &key) : LLFloater(key) // load it up initCallbacks(); + + return TRUE; } LLFloaterWindLight::~LLFloaterWindLight() { } -void LLFloaterWindLight::initCallbacks(void) { - - // help buttons - initHelpBtn("WLBlueHorizonHelp", "HelpBlueHorizon"); - initHelpBtn("WLHazeHorizonHelp", "HelpHazeHorizon"); - initHelpBtn("WLBlueDensityHelp", "HelpBlueDensity"); - initHelpBtn("WLHazeDensityHelp", "HelpHazeDensity"); - - initHelpBtn("WLDensityMultHelp", "HelpDensityMult"); - initHelpBtn("WLDistanceMultHelp", "HelpDistanceMult"); - initHelpBtn("WLMaxAltitudeHelp", "HelpMaxAltitude"); - - initHelpBtn("WLSunlightColorHelp", "HelpSunlightColor"); - initHelpBtn("WLAmbientHelp", "HelpSunAmbient"); - initHelpBtn("WLSunGlowHelp", "HelpSunGlow"); - initHelpBtn("WLTimeOfDayHelp", "HelpTimeOfDay"); - initHelpBtn("WLEastAngleHelp", "HelpEastAngle"); - - initHelpBtn("WLSceneGammaHelp", "HelpSceneGamma"); - initHelpBtn("WLStarBrightnessHelp", "HelpStarBrightness"); - - initHelpBtn("WLCloudColorHelp", "HelpCloudColor"); - initHelpBtn("WLCloudDetailHelp", "HelpCloudDetail"); - initHelpBtn("WLCloudDensityHelp", "HelpCloudDensity"); - initHelpBtn("WLCloudCoverageHelp", "HelpCloudCoverage"); - - initHelpBtn("WLCloudScaleHelp", "HelpCloudScale"); - initHelpBtn("WLCloudScrollXHelp", "HelpCloudScrollX"); - initHelpBtn("WLCloudScrollYHelp", "HelpCloudScrollY"); - - initHelpBtn("WLClassicCloudsHelp", "HelpClassicClouds"); - +void LLFloaterWindLight::initCallbacks(void) +{ LLWLParamManager * param_mgr = LLWLParamManager::getInstance(); // blue horizon @@ -235,6 +211,7 @@ void LLFloaterWindLight::initCallbacks(void) { childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL); } +#if 0 void LLFloaterWindLight::onClickHelp(void* data) { const std::string xml_alert = *(std::string*)data; @@ -245,6 +222,7 @@ void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& { childSetAction(name, onClickHelp, new std::string(xml_alert)); } +#endif bool LLFloaterWindLight::newPromptCallback(const LLSD& notification, const LLSD& response) { @@ -442,6 +420,7 @@ void LLFloaterWindLight::syncMenu() } +#if 0 // static LLFloaterWindLight* LLFloaterWindLight::instance() { @@ -500,6 +479,7 @@ void LLFloaterWindLight::onClose(bool app_quitting) sWindLight->setVisible(FALSE); } } +#endif // color control callbacks void LLFloaterWindLight::onColorControlRMoved(LLUICtrl* ctrl, void* userData) -- cgit v1.2.3