diff options
25 files changed, 1041 insertions, 2082 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 333c92e50d..aa781122ce 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1471,7 +1471,6 @@ bool LLAppViewer::cleanup() LLViewerObject::cleanupVOClasses(); LLWaterParamManager::cleanupClass(); - LLWLParamManager::cleanupClass(); LLPostProcess::cleanupClass(); LLTracker::cleanupInstance(); diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index ce1b899d55..213b95b119 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -103,7 +103,7 @@ void LLDrawPoolWater::prerender() // got rid of modulation by light color since it got a little too // green at sunset and sl-57047 (underwater turns black at 8:00) - sWaterFogColor = LLWaterParamManager::instance()->getFogColor(); + sWaterFogColor = LLWaterParamManager::instance().getFogColor(); sWaterFogColor.mV[3] = 0; } @@ -433,7 +433,7 @@ void LLDrawPoolWater::shade() //bind normal map S32 bumpTex = shader->enableTexture(LLViewerShaderMgr::BUMP_MAP); - LLWaterParamManager * param_mgr = LLWaterParamManager::instance(); + LLWaterParamManager * param_mgr = &LLWaterParamManager::instance(); // change mWaterNormp if needed if (mWaterNormp->getID() != param_mgr->getNormalMapID()) diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index f551aa6c8a..a257e4ea24 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -37,6 +37,7 @@ #include "llagent.h" #include "llviewerregion.h" +#include "llfloaterreg.h" #include "llfloaterwindlight.h" #include "llfloaterwater.h" #include "llfloaterenvsettings.h" @@ -45,6 +46,7 @@ #include "llfloaterregioninfo.h" #include "llwindlightscrubbers.h" #include "llwlhandlers.h" +#include "llnotifications.h" extern LLControlGroup gSavedSettings; @@ -78,7 +80,7 @@ void LLEnvManager::changedRegion(bool interp) mInterpNextChangeMessage = interp; mPendingOutgoingMessage = false; - LLFloaterEnvSettings::instance()->close(); + LLFloaterEnvSettings::instance()->closeFloater(); resetInternalsToDefault(LLEnvKey::SCOPE_REGION); @@ -144,7 +146,7 @@ void LLEnvManager::maybeClearEditingScope(bool user_initiated, bool was_commit) } else { - LLNotifications::instance().add("EnvEditExternalCancel", LLSD()); + LLNotifications::instance().add("EnvEditExternalCancel", LLSD(), LLSD()); } } @@ -160,7 +162,7 @@ void LLEnvManager::clearEditingScope(const LLSD& notification, const LLSD& respo { // *TODO: select terrain panel here mIsEditing = false; - LLFloaterRegionInfo::showInstance(); + LLFloaterReg::showTypedInstance<LLFloaterRegionInfo>("regioninfo"); return; } diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index efaac5cfc5..48f91aa64a 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -47,6 +47,7 @@ #include "llcombobox.h" #include "lllineeditor.h" #include "llwlanimator.h" +#include "llnotifications.h" #include "v4math.h" #include "llviewerdisplay.h" @@ -59,6 +60,7 @@ #include "llfloaterwindlight.h" #include "llwindlightscrubbers.h" #include "llenvmanager.h" +#include "llfloaterreg.h" LLFloaterDayCycle* LLFloaterDayCycle::sDayCycle = NULL; const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f; @@ -67,13 +69,12 @@ LLEnvKey::EScope LLFloaterDayCycle::sScope; std::string LLFloaterDayCycle::sOriginalTitle; LLWLAnimator::ETime LLFloaterDayCycle::sPreviousTimeType = LLWLAnimator::TIME_LINDEN; -LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floater")) +LLFloaterDayCycle::LLFloaterDayCycle(const LLSD &key) : LLFloater(key) { - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_day_cycle_options.xml", NULL, FALSE); sOriginalTitle = getTitle(); - llassert(MAX_LOCAL_KEY_FRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxSliderCount() && - MAX_REGION_KEYFRAMES <= getChild<LLMultiSliderCtrl>("WLDayCycleKeys")->getMaxSliderCount()); + 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"); @@ -90,10 +91,8 @@ LLFloaterDayCycle::~LLFloaterDayCycle() void LLFloaterDayCycle::onClickHelp(void* data) { - LLFloaterDayCycle* self = LLFloaterDayCycle::instance(); - std::string xml_alert = *(std::string *) data; - LLNotifications::instance().add(self->contextualNotification(xml_alert)); + LLNotifications::instance().add(xml_alert, LLSD(), LLSD()); } void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert) @@ -244,7 +243,7 @@ LLFloaterDayCycle* LLFloaterDayCycle::instance() { if (!sDayCycle) { - sDayCycle = new LLFloaterDayCycle(); + sDayCycle = new LLFloaterDayCycle("Day Cycle Floater"); // sDayCycle->open(); // sDayCycle->setFocus(TRUE); } @@ -265,7 +264,7 @@ void LLFloaterDayCycle::show(LLEnvKey::EScope scope) LLFloaterDayCycle* dayCycle = instance(); if(scope != sScope && ((LLView*)dayCycle)->getVisible()) { - LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD()); + LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); return; } sScope = scope; @@ -286,7 +285,7 @@ void LLFloaterDayCycle::show(LLEnvKey::EScope scope) //LLUICtrlFactory::getInstance()->buildFloater(dayCycle, "floater_day_cycle_options.xml"); //dayCycle->initCallbacks(); - dayCycle->open(); + dayCycle->openFloater(); } // virtual @@ -537,16 +536,16 @@ void LLFloaterDayCycle::onAddKey(void* userData) max_sliders = LLWLPacketScrubber::MAX_REGION_KEY_FRAMES; break; default: - max_sliders = kSldr->getMaxSliderCount(); + max_sliders = (S32)kSldr->getMaxValue(); break; } - if(kSldr->getSliderCount() >= max_sliders) + if(kSldr->getValue().asInteger() >= max_sliders) { LLSD args; args["SCOPE"] = LLEnvManager::getScopeString(sScope); args["MAX"] = max_sliders; - LLNotifications::instance().add("DayCycleTooManyKeyframes", args); + LLNotifications::instance().add("DayCycleTooManyKeyframes", LLSD(), args); return; } @@ -608,7 +607,7 @@ void LLFloaterDayCycle::onDeleteKey(void* userData) } else if(sSliderToKey.size() == 1) { - LLNotifications::instance().add("EnvCannotDeleteLastDayCycleKey", LLSD()); + LLNotifications::instance().add("EnvCannotDeleteLastDayCycleKey", LLSD(), LLSD()); return; } diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h index 1c021f0c6a..246a0357ba 100644 --- a/indra/newview/llfloaterdaycycle.h +++ b/indra/newview/llfloaterdaycycle.h @@ -59,7 +59,7 @@ public: class LLFloaterDayCycle : public LLFloater { public: - LLFloaterDayCycle(); + LLFloaterDayCycle(const LLSD &key); virtual ~LLFloaterDayCycle(); // map of sliders to parameters diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp index 6d1b27db07..eea333745f 100644 --- a/indra/newview/llfloaterenvsettings.cpp +++ b/indra/newview/llfloaterenvsettings.cpp @@ -43,6 +43,7 @@ #include "llcombobox.h" #include "llcolorswatch.h" #include "llwlanimator.h" +#include "llnotifications.h" #include "llwlparamset.h" #include "llwlparammanager.h" @@ -59,10 +60,8 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL; -LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater(std::string("Environment Settings Floater")) -{ - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml", NULL, FALSE); - +LLFloaterEnvSettings::LLFloaterEnvSettings(const LLSD &key) : LLFloater(key) +{ // load it up initCallbacks(); } @@ -73,8 +72,7 @@ LLFloaterEnvSettings::~LLFloaterEnvSettings() void LLFloaterEnvSettings::onClickHelp(void* data) { - LLFloaterEnvSettings* self = (LLFloaterEnvSettings*)data; - LLNotifications::instance().add(self->contextualNotification("EnvSettingsHelpButton")); + LLNotifications::instance().add("EnvSettingsHelpButton", LLSD(), LLSD()); } void LLFloaterEnvSettings::onUseRegionEnvironment(LLUICtrl* ctrl, void* data) @@ -212,7 +210,7 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::instance() { if (!sEnvSettings) { - sEnvSettings = new LLFloaterEnvSettings(); + sEnvSettings = new LLFloaterEnvSettings("Environment Editor Floater"); // sEnvSettings->open(); // sEnvSettings->setFocus(TRUE); } @@ -237,9 +235,9 @@ void LLFloaterEnvSettings::setControlsEnabled(bool enable) else { // disable UI elements the user shouldn't be able to see to protect potentially proprietary WL region settings from being visible - LLFloaterWindLight::instance()->close(); - LLFloaterWater::instance()->close(); - LLFloaterDayCycle::instance()->close(); + LLFloaterWindLight::instance()->closeFloater(); + LLFloaterWater::instance()->closeFloater(); + LLFloaterDayCycle::instance()->closeFloater(); childDisable("EnvAdvancedSkyButton"); childDisable("EnvAdvancedWaterButton"); childDisable("EnvUseEstateTimeButton"); @@ -267,9 +265,10 @@ void LLFloaterEnvSettings::show() sEnvSettings->childSetVisible("RegionWLOptIn", LLEnvManager::getInstance()->regionCapable()); sEnvSettings->setOptIn(opt_in); - sEnvSettings->getChildView("RegionWLOptIn")->setValue(LLSD::Boolean(opt_in)); + LLCheckBoxCtrl* checkbox = (LLCheckBoxCtrl*)envSettings->getChildView("RegionWLOptIn"); + checkbox->setValue(LLSD::Boolean(opt_in)); sEnvSettings->getChildView("RegionWLOptIn")->setToolTip(sEnvSettings->getString("region_environment_tooltip")); - envSettings->open(); + envSettings->openFloater(); } bool LLFloaterEnvSettings::isOpen() @@ -361,7 +360,7 @@ void LLFloaterEnvSettings::onOpenAdvancedSky(void* userData) void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData) { - LLFloaterWater::show(); + LLFloaterWater::instance()->openFloater(); } diff --git a/indra/newview/llfloaterenvsettings.h b/indra/newview/llfloaterenvsettings.h index 0bf3e48676..54611a81c3 100644 --- a/indra/newview/llfloaterenvsettings.h +++ b/indra/newview/llfloaterenvsettings.h @@ -45,7 +45,7 @@ class LLFloaterEnvSettings : public LLFloater { public: - LLFloaterEnvSettings(); + LLFloaterEnvSettings(const LLSD &key); virtual ~LLFloaterEnvSettings(); /// initialize all the callbacks for the menu diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index f6377d50fa..7617b98f20 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -51,6 +51,7 @@ #include "llcombobox.h" #include "llenvmanager.h" #include "llfilepicker.h" +#include "llfloaterdaycycle.h" #include "llfloatergodtools.h" // for send_sim_wide_deletes() #include "llfloatertopobjects.h" // added to fix SL-32336 #include "llfloatergroups.h" @@ -1167,7 +1168,7 @@ LLPanelRegionTerrainInfo* LLPanelRegionTerrainInfo::instance() } // virtual -void LLPanelRegionTerrainInfo::close(bool app_quitting) +void LLPanelRegionTerrainInfo::closeFloater(bool app_quitting) { if (sPanelRegionTerrainInfo) { @@ -1407,7 +1408,7 @@ void LLPanelRegionTerrainInfo::onOpenAdvancedSky(void* userData) void LLPanelRegionTerrainInfo::onOpenAdvancedWater(void* userData) { - LLFloaterWater::show(LLEnvKey::SCOPE_REGION); + LLFloaterWater::instance()->show(LLEnvKey::SCOPE_REGION); } @@ -1449,9 +1450,9 @@ void LLPanelRegionTerrainInfo::onSetRegionToDefaultWL(void* userData) void LLPanelRegionTerrainInfo::cancelChanges() { - LLFloaterWindLight::instance()->close(); - LLFloaterWater::instance()->close(); - LLFloaterDayCycle::instance()->close(); + LLFloaterWindLight::instance()->closeFloater(); + LLFloaterWater::instance()->closeFloater(); + LLFloaterDayCycle::instance()->closeFloater(); // disable commmit and cancel LLPanelRegionTerrainInfo::instance()->setCommitControls(false); @@ -2130,14 +2131,14 @@ bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region) return rv; } -void LLFloaterRegionInfo::close(bool app_quitting) +void LLFloaterRegionInfo::closeFloater(bool app_quitting) { if(!app_quitting) { LLEnvManager::getInstance()->maybeClearEditingScope(true, false); - LLPanelRegionTerrainInfo::close(app_quitting); + LLPanelRegionTerrainInfo::closeFloater(app_quitting); } - LLFloater::close(app_quitting); + LLFloater::closeFloater(app_quitting); } void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl) diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 2fdec5a944..b1f7e88d33 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -73,6 +73,8 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); + /*virtual*/void closeFloater(bool app_quitting); + static void processEstateOwnerRequest(LLMessageSystem* msg, void**); // get and process region info if necessary. @@ -236,7 +238,7 @@ public: static LLPanelRegionTerrainInfo* instance(); virtual BOOL postBuild(); // LLPanel - static void close(bool app_quitting); + static void closeFloater(bool app_quitting); F32 getSunHour(); virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index a443b788fb..4bc8523d0a 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -45,6 +45,7 @@ #include "llfloaterdaycycle.h" #include "llboost.h" #include "llmultisliderctrl.h" +#include "llnotifications.h" #include "v4math.h" #include "llviewerdisplay.h" @@ -104,6 +105,47 @@ BOOL LLFloaterWater::postBuild() syncMenu(); return TRUE; } + +//static +LLFloaterWater* LLFloaterWater::instance() +{ + if (!sWater) + { + sWater = new LLFloaterWater(LLSD()); + } + return sWater; +} + +void LLFloaterWater::show(LLEnvKey::EScope scope) +{ + LLFloaterWater* water = instance(); + + if(scope != sScope && ((LLView*)water)->getVisible()) + { + LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); + return; + } + sScope = scope; + std::string scope_str = ""; + switch(sScope) + { + case LLEnvKey::SCOPE_LOCAL: + scope_str = LLTrans::getString("LocalSettings"); + break; + case LLEnvKey::SCOPE_REGION: + scope_str = LLTrans::getString("RegionSettings"); + break; + } + std::string title = sOriginalTitle + " (" + scope_str + ")"; + water->setTitle(title); + water->syncMenu(); + + LLEnvManager::instance().startEditingScope(scope); + + water->openFloater(); + +} + void LLFloaterWater::initCallbacks(void) { LLWaterParamManager * param_mgr = LLWaterParamManager::getInstance(); @@ -620,7 +662,7 @@ void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl) std::string data = ctrl->getValue().asString(); if(!data.empty()) { - LLWaterParamManager::instance()->loadPreset(data); + LLWaterParamManager::instance().loadPreset(data); syncMenu(); } } diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 57fb9745b1..8b3915bfe9 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -35,6 +35,7 @@ #include <vector> #include "llwlparamset.h" +#include "llenvmanager.h" struct WaterVector2Control; struct WaterVector3Control; @@ -53,6 +54,11 @@ public: /// initialize all void initCallbacks(void); + // one instance only + static LLFloaterWater* instance(); + + void show(LLEnvKey::EScope scope); + bool newPromptCallback(const LLSD& notification, const LLSD& response); /// general purpose callbacks for dealing with color controllers @@ -103,6 +109,8 @@ private: static std::set<std::string> sDefaultPresets; static LLEnvKey::EScope sScope; static std::string sOriginalTitle; + + static LLFloaterWater* sWater; }; diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index 960a552b3d..d5ba0befec 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -48,6 +48,7 @@ #include "lllineeditor.h" #include "llfloaterdaycycle.h" #include "llboost.h" +#include "llnotifications.h" #include "v4math.h" #include "llviewerdisplay.h" @@ -68,9 +69,8 @@ std::string LLFloaterWindLight::sOriginalTitle; static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f; -LLFloaterWindLight::LLFloaterWindLight() : LLFloater(std::string("windlight floater")) +LLFloaterWindLight::LLFloaterWindLight(const LLSD &key) : LLFloater(key) { - LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_options.xml", NULL, FALSE); sOriginalTitle = getTitle(); // add the combo boxes @@ -207,6 +207,8 @@ void LLFloaterWindLight::initCallbacks(void) { childSetCommitCallback("WLCloudDetailDensity", onColorControlBMoved, ¶m_mgr->mCloudDetail); // Cloud extras + static std::string use_classic_clouds = "SkyUseClassicClouds"; + childSetCommitCallback("WLCloudCoverage", onFloatControlMoved, ¶m_mgr->mCloudCoverage); childSetCommitCallback("WLCloudScale", onFloatControlMoved, ¶m_mgr->mCloudScale); childSetCommitCallback("WLCloudLockX", onCloudScrollXToggled, NULL); @@ -214,7 +216,7 @@ void LLFloaterWindLight::initCallbacks(void) { childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL); childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL); childSetCommitCallback("WLDistanceMult", onFloatControlMoved, ¶m_mgr->mDistanceMult); - childSetCommitCallback("DrawClassicClouds", LLSavedSettingsGlue::setBOOL, (void*)"SkyUseClassicClouds"); + //childSetCommitCallback("DrawClassicClouds", LLSavedSettingsGlue::setBOOL, (void*)&use_classic_clouds); // WL Top childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL); @@ -226,8 +228,7 @@ void LLFloaterWindLight::initCallbacks(void) { childSetAction("WLSavePreset", onSavePreset, comboBox); childSetAction("WLDeletePreset", onDeletePreset, comboBox); - comboBox->setCommitCallback(onChangePresetName); - + //childSetAction("WLPresetsCombo", onChangePresetName, comboBox); // Dome childSetCommitCallback("WLGamma", onFloatControlMoved, ¶m_mgr->mWLGamma); @@ -236,10 +237,8 @@ void LLFloaterWindLight::initCallbacks(void) { void LLFloaterWindLight::onClickHelp(void* data) { - LLFloaterWindLight* self = LLFloaterWindLight::instance(); - const std::string xml_alert = *(std::string*)data; - LLNotifications::instance().add(self->contextualNotification(xml_alert)); + LLNotifications::instance().add(xml_alert, LLSD(), LLSD()); } void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& xml_alert) @@ -304,7 +303,7 @@ bool LLFloaterWindLight::newPromptCallback(const LLSD& notification, const LLSD& } else { - LLNotifications::instance().add("ExistsSkyPresetAlert"); + LLNotifications::instance().add("ExistsSkyPresetAlert", LLSD(), LLSD()); } } return false; @@ -448,16 +447,17 @@ LLFloaterWindLight* LLFloaterWindLight::instance() { if (!sWindLight) { - sWindLight = new LLFloaterWindLight(); + sWindLight = new LLFloaterWindLight("WindLight floater"); } return sWindLight; } + void LLFloaterWindLight::show(LLEnvKey::EScope scope) { LLFloaterWindLight* windLight = instance(); if(scope != sScope && ((LLView*)windLight)->getVisible()) { - LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD()); + LLNotifications::instance().add("EnvOtherScopeAlreadyOpen", LLSD(), LLSD()); return; } sScope = scope; @@ -481,7 +481,7 @@ void LLFloaterWindLight::show(LLEnvKey::EScope scope) //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml"); //windLight->initCallbacks(); - windLight->open(); + windLight->openFloater(); } bool LLFloaterWindLight::isOpen() @@ -824,7 +824,7 @@ void LLFloaterWindLight::onSavePreset(void* userData) LLWLParamKey(comboBox->getSelectedValue())); if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("SkyEditPresets")) { - LLNotifications::instance().add("WLNoEditDefault"); + LLNotifications::instance().add("WLNoEditDefault", LLSD(), LLSD()); return; } @@ -896,7 +896,7 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS std::set<LLWLParamKey>::iterator sIt = sDefaultPresets.find(key); if(sIt != sDefaultPresets.end()) { - LLNotifications::instance().add("WLNoEditDefault"); + LLNotifications::instance().add("WLNoEditDefault", LLSD(), LLSD()); return false; } diff --git a/indra/newview/llfloaterwindlight.h b/indra/newview/llfloaterwindlight.h index c0fea2558c..3b137e601f 100644 --- a/indra/newview/llfloaterwindlight.h +++ b/indra/newview/llfloaterwindlight.h @@ -50,7 +50,7 @@ struct WLFloatControl; class LLFloaterWindLight : public LLFloater { public: - LLFloaterWindLight(); + LLFloaterWindLight(const LLSD &key); virtual ~LLFloaterWindLight(); /// initialize all diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 614eb6ed88..808ab1e344 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7630,7 +7630,7 @@ class LLWorldEnvSettings : public view_listener_t } else if(gSavedSettings.getBOOL("UseEnvironmentFromRegion")) { - LLNotifications::instance().add("EnvLockedUsingRegion", LLSD()); + LLNotifications::instance().add("EnvLockedUsingRegion", LLSD(), LLSD()); } else { diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 0ed254bbc5..9b4c85fb0c 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1495,8 +1495,3 @@ std::string LLViewerRegion::getDescription() const { return stringize(*this); } - -std::string LLViewerRegion::getDescription() const -{ - return stringize(*this); -} diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 307e2cf3a2..284503361a 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -400,11 +400,6 @@ private: LLEventPoll* mEventPoll; - /// Post an event to this LLCapabilityListener to invoke a capability message on - /// this LLViewerRegion's server - /// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities) - LLCapabilityListener mCapabilityListener; - /// Post an event to this LLCapabilityListener to invoke a capability message on /// this LLViewerRegion's server /// (https://wiki.lindenlab.com/wiki/Viewer:Messaging/Messaging_Notes#Capabilities) diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp index c984938303..61a69bdde1 100644 --- a/indra/newview/llwaterparammanager.cpp +++ b/indra/newview/llwaterparammanager.cpp @@ -78,6 +78,11 @@ LLWaterParamManager::~LLWaterParamManager() { } +LLWaterParamManager::cleanupClass() +{ + // TODO: what needs to be cleaned up? +} + void LLWaterParamManager::loadAllPresets(const std::string& file_name) { std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", "")); @@ -254,11 +259,11 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader) } } -static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params"); +static LLFastTimer::DeclareTimer FTM_UPDATE_WATERPARAM("Update Water Params"); void LLWaterParamManager::update(LLViewerCamera * cam) { - LLFastTimer ftm(FTM_UPDATE_WLPARAM); + LLFastTimer ftm(FTM_UPDATE_WATERPARAM); // update the shaders and the menu propagateParameters(); diff --git a/indra/newview/llwlanimator.cpp b/indra/newview/llwlanimator.cpp index 2e249b9701..3d51ad89ff 100644 --- a/indra/newview/llwlanimator.cpp +++ b/indra/newview/llwlanimator.cpp @@ -47,7 +47,7 @@ LLWLAnimator::LLWLAnimator() : mStartTime(0.f), mDayRate(1.f), mDayTime(0.f), void LLWLAnimator::update(LLWLParamSet& curParams) { - llassert(mUseLindenTime != mUseLocalTime); + //llassert(mUseLindenTime != mUseLocalTime); F64 curTime; curTime = getDayTime(); diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp index 52bbb4b5fc..b36fa5c485 100644 --- a/indra/newview/llwldaycycle.cpp +++ b/indra/newview/llwldaycycle.cpp @@ -36,6 +36,7 @@ #include "llsdserialize.h" #include "llwlparammanager.h" #include "llfloaterdaycycle.h" +#include "llnotifications.h" #include "llviewerwindow.h" @@ -84,7 +85,7 @@ void LLWLDayCycle::loadDayCycle(const LLSD& day_data, LLWLParamKey::EScope scope // alert the user LLSD args; args["SKY"] = day_data[i][1].asString(); - LLNotifications::instance().add("WLMissingSky", args); + LLNotifications::instance().add("WLMissingSky", LLSD(), args); continue; } } diff --git a/indra/newview/llwlhandlers.cpp b/indra/newview/llwlhandlers.cpp index c4f11cf00a..f09692b2b7 100644 --- a/indra/newview/llwlhandlers.cpp +++ b/indra/newview/llwlhandlers.cpp @@ -37,6 +37,7 @@ #include "llagent.h" #include "llviewerregion.h" #include "llenvmanager.h" +#include "llnotifications.h" /**** * LLEnvironmentRequestResponder @@ -108,7 +109,7 @@ bool LLEnvironmentApplyResponder::initiateRequest(const LLSD& content) { LLSD args(LLSD::emptyMap()); args["WAIT"] = (F64)UPDATE_WAIT_SECONDS; - LLNotifications::instance().add("EnvUpdateRate", args); + LLNotifications::instance().add("EnvUpdateRate", LLSD(), args); return false; } @@ -139,7 +140,7 @@ bool LLEnvironmentApplyResponder::initiateRequest(const LLSD& content) LL_WARNS("WindlightCaps") << "Region couldn't apply windlight settings! Reason from sim: " << content["fail_reason"].asString() << LL_ENDL; LLSD args(LLSD::emptyMap()); args["FAIL_REASON"] = content["fail_reason"].asString(); - LLNotifications::instance().add("WLRegionApplyFail", args); + LLNotifications::instance().add("WLRegionApplyFail", LLSD(), args); } LLEnvManager::getInstance()->commitSettingsFinished(LLEnvKey::SCOPE_REGION); @@ -153,7 +154,7 @@ bool LLEnvironmentApplyResponder::initiateRequest(const LLSD& content) LLSD args(LLSD::emptyMap()); args["FAIL_REASON"] = msg.str(); - LLNotifications::instance().add("WLRegionApplyFail", args); + LLNotifications::instance().add("WLRegionApplyFail", LLSD(), args); LLEnvManager::getInstance()->commitSettingsFinished(LLEnvKey::SCOPE_REGION); } diff --git a/indra/newview/llwlhandlers.h b/indra/newview/llwlhandlers.h index a50404f2e1..811dc4bb73 100644 --- a/indra/newview/llwlhandlers.h +++ b/indra/newview/llwlhandlers.h @@ -34,6 +34,7 @@ #define LL_LLWLHANDLERS_H #include "llviewerprecompiledheaders.h" +#include "llhttpclient.h" class LLEnvManager; diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 493d066942..3070fed81f 100644 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -433,9 +433,11 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader) } +static LLFastTimer::DeclareTimer FTM_UPDATE_WLPARAM("Update Windlight Params"); + void LLWLParamManager::propagateParameters(void) { - LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM); + LLFastTimer ftm(FTM_UPDATE_WLPARAM); LLVector4 sunDir; LLVector4 moonDir; @@ -459,7 +461,7 @@ void LLWLParamManager::propagateParameters(void) { mLightDir = sunDir; } - else if(sunDir.mV[1] < 0 && sunDir.mV[1] > NIGHTTIME_ELEVATION_COS) + else if(sunDir.mV[1] < 0 && sunDir.mV[1] > LLSky::NIGHTTIME_ELEVATION_COS) { // clamp v1 to 0 so sun never points up and causes weirdness on some machines LLVector3 vec(sunDir.mV[0], sunDir.mV[1], sunDir.mV[2]); @@ -506,7 +508,7 @@ void LLWLParamManager::propagateParameters(void) void LLWLParamManager::update(LLViewerCamera * cam) { - LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM); + LLFastTimer ftm(FTM_UPDATE_WLPARAM); // update clouds, sun, and general mCurParams.updateCloudScrolling(); diff --git a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml index 65e2462ef8..84812b9de6 100644 --- a/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/en/floater_day_cycle_options.xml @@ -1,558 +1,250 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="275" - layout="topleft" - name="Day Cycle Floater" - help_topic="day_cycle_floater" - save_rect="true" - title="DAY CYCLE EDITOR" - width="658"> - <tab_container - follows="left|top" - height="255" - layout="topleft" - left="0" - name="Day Cycle Tabs" - tab_position="top" - top="20" - width="656"> - <panel - border="true" - follows="left|top|right|bottom" - height="255" - label="Day Cycle" - layout="topleft" - left="1" - mouse_opaque="false" - name="Day Cycle" - top="0" - width="654"> - <multi_slider - can_edit_text="true" - control_name="WLTimeSlider" - decimal_digits="0" - draw_track="false" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left="20" - max_sliders="20" - max_val="24" - name="WLTimeSlider" - show_text="false" - top="25" - use_triangle="true" - width="525" /> - <multi_slider - can_edit_text="true" - control_name="WLDayCycleKeys" - decimal_digits="0" - follows="bottom" - height="10" - increment="0.0833333" - initial_value="0" - layout="topleft" - left_delta="0" - max_sliders="20" - max_val="24" - name="WLDayCycleKeys" - show_text="false" - top_pad="15" - width="525" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left="8" - name="WL12am" - top="74" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3am" - top_delta="0" - width="55"> - 3am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6am" - top_delta="0" - width="55"> - 6am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9amHash" - top_delta="0" - width="55"> - 9am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12pmHash" - top_delta="0" - width="55"> - 12pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL3pm" - top_delta="0" - width="55"> - 3pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL6pm" - top_delta="0" - width="55"> - 6pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL9pm" - top_delta="0" - width="55"> - 9pm - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - height="16" - layout="topleft" - left_pad="10" - name="WL12am2" - top_delta="0" - width="55"> - 12am - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left="20" - name="WL12amHash" - top="54" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3amHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6amHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9amHash2" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12pmHash2" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL3pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL6pmHash" - top_delta="-3" - width="6"> - | - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="11" - layout="topleft" - left_pad="59" - name="WL9pmHash" - top_delta="3" - width="6"> - I - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="14" - layout="topleft" - left_pad="59" - name="WL12amHash2" - top_delta="-3" - width="6"> - | - </text> - <button - height="20" - label="Add Key" - label_selected="Add Key" - layout="topleft" - left="555" - name="WLAddKey" - top="30" - width="96" /> - <button - height="20" - label="Delete Key" - label_selected="Delete Key" - layout="topleft" - left_delta="0" - name="WLDeleteKey" - top_pad="5" - width="96" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="20" - name="WLCurKeyFrameText" - top="104" - width="235"> - Key Frame Settings: - </text> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText" - top="124" - width="105"> - Key Time: - </text> - <spinner - control_name="WLCurKeyHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="35" - layout="topleft" - left_delta="20" - max_val="100" - name="WLCurKeyHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLCurKeyMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="5" - initial_value="0" - label="Min" - label_width="45" - layout="topleft" - left_pad="5" - max_val="55" - name="WLCurKeyMin" - top_delta="0" - width="85" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="30" - name="WLCurKeyTimeText2" - top="169" - width="185"> - Key Preset: - </text> - <combo_box - height="18" - label="Preset" - layout="topleft" - left_delta="0" - name="WLKeyPresets" - top_pad="7" - width="205" /> - <view_border - bevel_style="none" - follows="top|left" - height="115" - layout="topleft" - left="12" - top="101" - width="240" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_pad="15" - name="DayCycleText" - top="114" - width="120"> - Snap: - </text> - <combo_box - enabled="false" - height="18" - label="5 min" - layout="topleft" - left_delta="0" - name="WLSnapOptions" - top_pad="7" - width="70" /> - <text - type="string" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="DayCycleText2" - top_pad="17" - width="120"> - Length of Cycle: - </text> - <spinner - control_name="WLLengthOfDayHour" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Hour" - label_width="33" - layout="topleft" - left_delta="-3" - max_val="100" - name="WLLengthOfDayHour" - top_pad="4" - width="74" /> - <spinner - control_name="WLLengthOfDayMin" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="0" - label="Min" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDayMin" - top_delta="0" - width="65" /> - <spinner - control_name="WLLengthOfDaySec" - decimal_digits="0" - follows="left|top" - height="16" - increment="1" - initial_value="24" - label="Sec" - label_width="25" - layout="topleft" - left_pad="2" - max_val="59" - name="WLLengthOfDaySec" - top_delta="0" - width="65"/> - <text - type="string" - halign="right" - length="1" - border_visible="true" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-23" - name="DayCycleText3" - top="114" - width="85"> - Preview : - </text> - <button - height="20" - label="Play" - label_selected="Play" - layout="topleft" - left="480" - name="WLAnimSky" - top_pad="5" - width="83" /> - <button - height="20" - label="Stop!" - label_selected="Stop" - layout="topleft" - left_pad="4" - name="WLStopAnimSky" - top_delta="0" - width="83" /> - <button - height="20" - label="Use Estate Time" - label_selected="Go to Estate Time" - layout="topleft" - left="480" - name="WLUseLindenTime" - top_pad="9" - width="170" /> - <button - height="20" - label="Save Test Day" - label_selected="Save Test Day" - layout="topleft" - left_delta="0" - name="WLSaveDayCycle" - top_pad="9" - width="170" /> - <button - height="20" - label="Load Test Day" - label_selected="Load Test Day" - layout="topleft" - left_delta="0" - name="WLLoadDayCycle" - top_pad="3" - width="170" /> - </panel> - </tab_container> +<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true" + can_resize="false" height="275" left="50" min_height="180" + min_width="400" mouse_opaque="true" name="Day Cycle Floater" + rect_control="FloaterDayCycleRect" title="Day Cycle Editor" width="646"> + <tab_container bottom="-275" follows="left|top" height="255" left="0" + mouse_opaque="false" name="Day Cycle Tabs" tab_position="top" width="644"> + <panel border="true" bottom="-255" follows="left|top|right|bottom" height="255" + label="Day Cycle" left="1" mouse_opaque="false" + name="Day Cycle" width="642"> + <button bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="15" + label="?" left="612" name="WLDayCycleHelp" width="18" /> + <multi_slider allow_overlap="false" bottom="-35" can_edit_text="true" + control_name="WLTimeSlider" decimal_digits="0" draw_track="false" + follows="bottom" height="10" increment="0.08333333333" initial_val="0" + label="" left="20" max_sliders="20" max_val="24" min_val="0" + mouse_opaque="true" name="WLTimeSlider" show_text="false" + use_triangle="true" value="0" width="525" /> + <multi_slider allow_overlap="false" bottom="-60" can_edit_text="true" + control_name="WLDayCycleKeys" decimal_digits="0" follows="bottom" + height="10" increment="0.08333333333" initial_val="0" label="" left="20" + max_sliders="20" max_val="24" min_val="0" mouse_opaque="true" + name="WLDayCycleKeys" show_text="false" value="0" width="525" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-80" control_name="WL12am" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left="8" mouse_opaque="true" name="WL12am" + v_pad="0" width="55"> + 12am + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL3am" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" name="WL3am" + v_pad="0" width="55"> + 3am + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL6am" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" name="WL6am" + v_pad="0" width="55"> + 6am + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL9am" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" + name="WL9amHash" v_pad="0" width="55"> + 9am + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL12pm" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" + name="WL12pmHash" v_pad="0" width="55"> + 12pm + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL3pm" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" name="WL3pm" + v_pad="0" width="55"> + 3pm + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL6pm" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" name="WL6pm" + v_pad="0" width="55"> + 6pm + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL9pm" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" name="WL9pm" + v_pad="0" width="55"> + 9pm + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL12am2" drop_shadow_visible="true" + follows="left|top|right" font="SansSerifSmall" h_pad="0" halign="left" + height="6" left_delta="65" mouse_opaque="true" + name="WL12am2" v_pad="0" width="55"> + 12am + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-68" control_name="WL12amHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="14" left="20" mouse_opaque="true" name="WL12amHash" + v_pad="0" width="4"> + | + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL3amHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="11" left_delta="65" mouse_opaque="true" + name="WL3amHash" v_pad="0" width="4"> + I + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL6amHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="14" left_delta="65" mouse_opaque="true" + name="WL6amHash" v_pad="0" width="4"> + | + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL9amHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="11" left_delta="65" mouse_opaque="true" + name="WL9amHash2" v_pad="0" width="4"> + I + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL12pmHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="14" left_delta="65" mouse_opaque="true" + name="WL12pmHash2" v_pad="0" width="4"> + | + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL3pmHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="11" left_delta="65" mouse_opaque="true" + name="WL3pmHash" v_pad="0" width="4"> + I + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL6pmHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="14" left_delta="65" mouse_opaque="true" + name="WL6pmHash" v_pad="0" width="4"> + | + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL9pmHash" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="11" left_delta="65" mouse_opaque="true" + name="WL9pmHash" v_pad="0" width="4"> + I + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="0" control_name="WL12amHash2" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="14" left_delta="65" mouse_opaque="true" + name="WL12amHash2" v_pad="0" width="4"> + | + </text> + <button bottom="-40" enabled="true" font="SansSerif" halign="center" height="20" + label="Add Key" label_selected="Add Key" left="550" + mouse_opaque="true" name="WLAddKey" scale_image="true" width="80" /> + <button bottom="-65" enabled="true" font="SansSerif" halign="center" height="20" + label="Delete Key" label_selected="Delete Key" left="550" + mouse_opaque="true" name="WLDeleteKey" scale_image="true" width="80" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-120" control_name="DayCycleText" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="16" left="20" mouse_opaque="true" + name="WLCurKeyFrameText" v_pad="0" width="150"> + Key Frame Settings: + </text> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-140" control_name="DayCycleText" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="16" left="30" mouse_opaque="true" + name="WLCurKeyTimeText" v_pad="0" width="100"> + Key Time: + </text> + <spinner bottom_delta="-20" can_edit_text="true" control_name="WLCurKeyHour" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0" + max_val="100" min_val="0" mouse_opaque="true" name="WLCurKeyHour" + width="70" /> + <spinner bottom_delta="0" can_edit_text="true" control_name="WLCurKeyMin" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="5" initial_val="0" label="Min" label_width="20" left_delta="75" + max_val="55" min_val="0" mouse_opaque="true" name="WLCurKeyMin" width="60" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom_delta="-25" control_name="WLCurKeyTimeText" + drop_shadow_visible="true" follows="left|top|right" font="SansSerif" + h_pad="0" halign="left" height="16" left="30" + mouse_opaque="true" name="WLCurKeyTimeText2" v_pad="0" width="120"> + Key Preset: + </text> + <combo_box allow_text_entry="false" bottom_delta="-25" enabled="true" follows="left|top" + height="18" label="Preset" left_delta="0" max_chars="20" + mouse_opaque="true" name="WLKeyPresets" width="155" /> + <view_border bevel_style="none" border_thickness="1" bottom_delta="-6" follows="top|left" + height="115" left="12" width="190" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-130" control_name="DayCycleText" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="16" left="220" mouse_opaque="true" + name="DayCycleText" v_pad="0" width="120"> + Snap: + </text> + <combo_box allow_text_entry="false" bottom_delta="-25" enabled="false" follows="left|top" + height="18" label="5 min" left_delta="0" max_chars="20" mouse_opaque="true" + name="WLSnapOptions" width="70" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-180" control_name="DayCycleText" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="16" left="220" mouse_opaque="true" + name="DayCycleText2" v_pad="0" width="120"> + Length of Cycle: + </text> + <spinner bottom_delta="-20" can_edit_text="true" control_name="WLLengthOfDayHour" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="0" label="Hour" label_width="30" left_delta="0" + max_val="100" min_val="0" mouse_opaque="true" name="WLLengthOfDayHour" + width="70" /> + <spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDayMin" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="0" label="Min" label_width="20" left_delta="75" + max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDayMin" + width="60" /> + <spinner bottom_delta="0" can_edit_text="true" control_name="WLLengthOfDaySec" + decimal_digits="0" enabled="true" follows="left|top" height="16" + increment="1" initial_val="24" label="Sec" label_width="20" left_delta="65" + max_val="59" min_val="0" mouse_opaque="true" name="WLLengthOfDaySec" + width="60" /> + <text type="string" length="1" bg_visible="true" border_drop_shadow_visible="false" border_visible="true" + bottom="-130" control_name="DayCycleText" drop_shadow_visible="true" + follows="left|top|right" font="SansSerif" h_pad="0" halign="left" + height="16" left="310" mouse_opaque="true" + name="DayCycleText3" v_pad="0" width="120"> + Preview: + </text> + <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20" + label="Play" label_selected="Play" left="310" + mouse_opaque="true" name="WLAnimSky" scale_image="true" width="50" /> + <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20" + label="Stop!" label_selected="Stop" left_delta="55" + mouse_opaque="true" name="WLStopAnimSky" scale_image="true" width="50" /> + <button bottom="-155" enabled="true" font="SansSerif" halign="center" height="20" + label="Use Estate Time" label_selected="Go to Estate Time" + left_delta="55" mouse_opaque="true" name="WLUseLindenTime" + scale_image="true" width="140" /> + <button bottom="-195" enabled="true" font="SansSerif" halign="center" height="20" + label="Save Test Day" label_selected="Save Test Day" + left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true" + width="150" /> + <button bottom="-220" enabled="true" font="SansSerif" halign="center" height="20" + label="Load Test Day" label_selected="Load Test Day" + left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true" + width="150" /> + </panel> + </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_env_settings.xml b/indra/newview/skins/default/xui/en/floater_env_settings.xml index 14f9e2db95..bd0a2ff330 100644 --- a/indra/newview/skins/default/xui/en/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_env_settings.xml @@ -1,163 +1,72 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="150" - layout="topleft" - name="Environment Editor Floater" - help_topic="environment_editor_floater" - save_rect="true" - title="ENVIRONMENT EDITOR" - width="600"> - <floater.string - name="timeStr"> - [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvTimeText" - top="32" - width="140"> - Time of Day - </text> - <text - type="string" - length="1" - follows="left|top|right" - height="16" - layout="topleft" - left="15" - name="EnvTimeText2" - top="62" - width="140"> - 12:00 PM - </text> - <icon - height="25" - image_name="icon_diurnal.tga" - layout="topleft" - left="85" - name="EnvDayCycle" - top="30" - width="200" /> - <slider - control_name="EnvTimeSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.0069444" - initial_value="0.7" - layout="topleft" - left_delta="0" - max_val="0.99" - name="EnvTimeSlider" - show_text="false" - top_pad="10" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="EnvCloudText" - top="86" - width="140"> - Cloud Cover - </text> - <slider - control_name="EnvCloudSlider" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="75" - name="EnvCloudSlider" - top_delta="4" - width="210" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterColorText" - top="39" - width="140"> - Water Color - </text> - <color_swatch - can_apply_immediately="true" - color="0.5 0.5 0.5 1" - follows="left|top" - height="50" - layout="topleft" - left="390" - name="EnvWaterColor" - tool_tip="Click to open color picker" - top="30" - width="40" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="310" - name="EnvWaterFogText" - top="86" - width="140"> - Water Fog - </text> - <slider - control_name="EnvWaterFogSlider" - decimal_digits="2" - follows="left" - height="10" - initial_value="0" - layout="topleft" - left_delta="75" - max_val="10" - name="EnvWaterFogSlider" - top_delta="4" - width="210" /> - <button - follows="left|top" - height="23" - label="Use Estate Time" - layout="topleft" - left="10" - name="EnvUseEstateTimeButton" - top="120" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Sky" - layout="topleft" - left_pad="3" - name="EnvAdvancedSkyButton" - top_delta="0" - width="137" /> - <button - follows="left|top" - height="23" - label="Advanced Water" - layout="topleft" - left_pad="3" - name="EnvAdvancedWaterButton" - top_delta="0" - width="137" /> +<floater bottom="-130" can_close="true" can_drag_on_left="false" can_minimize="true" + can_resize="false" height="175" left="50" min_height="175" + min_width="600" mouse_opaque="true" name="Environment Editor Floater" + rect_control="FloaterEnvRect" title="Environment Editor" width="600"> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-48" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="EnvTimeText" v_pad="0" width="140"> + Time of Day + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-30" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="left" height="16" + left="15" mouse_opaque="true" name="EnvTimeText2" v_pad="0" width="140"> + 12:00 PM + </text> + <icon bottom="-55" follows="left|top" height="25" image_name="icon_diurnal.tga" + left="85" name="EnvDayCycle" width="200" /> + <slider bottom_delta="-20" can_edit_text="false" control_name="EnvTimeSlider" + decimal_digits="2" follows="left" height="10" increment="0.0069444" + initial_val="0.7" label="" left_delta="0" max_val="0.99" min_val="0" + mouse_opaque="true" name="EnvTimeSlider" show_text="false" value="0.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-102" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="EnvCloudText" v_pad="0" width="140"> + Cloud Cover + </text> + <slider bottom="-100" can_edit_text="false" control_name="EnvCloudSlider" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="85" max_val="1" min_val="0" + mouse_opaque="true" name="EnvCloudSlider" show_text="true" value="0.7" + width="210" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-55" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="310" mouse_opaque="true" name="EnvWaterColorText" v_pad="0" + width="140"> + Water Color + </text> + <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80" + can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top" + height="50" label="" left="390" mouse_opaque="true" + name="EnvWaterColor" tool_tip="Click to open Color Picker" width="40" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-102" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="310" mouse_opaque="true" name="EnvWaterFogText" v_pad="0" width="140"> + Water Fog + </text> + <slider bottom="-100" can_edit_text="false" control_name="EnvWaterFogSlider" + decimal_digits="2" follows="left" height="10" increment="0.1" + initial_val="0" label="" left="385" max_val="10" min_val="0" + mouse_opaque="true" name="EnvWaterFogSlider" show_text="true" value="0" + width="210" /> + <button bottom="-140" follows="left|top" font="SansSerifSmall" height="20" + label="Use Estate Time" left="8" name="EnvUseEstateTimeButton" width="137" /> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" + label="Use Local Time" left_delta="147" name="EnvUseLocalTimeButton" width="137" /> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" + label="Advanced Sky" left_delta="147" name="EnvAdvancedSkyButton" width="137" /> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" + label="Advanced Water" left_delta="147" name="EnvAdvancedWaterButton" width="137" /> + <check_box bottom_delta="-30" follows="left|top" left="8" name="RegionWLOptIn" label="Use Region Environment Settings"/> + <string name="region_environment_tooltip"> + Check this box to use the region's environment settings. Uncheck this box to set your own custom environment settings. You cannot view the region's environment settings if this box is checked. + </string> + <button bottom="-40" follows="left|top" font="SansSerif" height="18" label="?" left="570" name="EnvSettingsHelpButton" + width="18" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_windlight_options.xml b/indra/newview/skins/default/xui/en/floater_windlight_options.xml index 85a5be369c..906e7de492 100644 --- a/indra/newview/skins/default/xui/en/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/en/floater_windlight_options.xml @@ -1,1287 +1,593 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - height="256" - layout="topleft" - name="WindLight floater" - help_topic="windlight_floater" - save_rect="true" - title="ADVANCED SKY EDITOR" - width="700"> - <floater.string - name="WLDefaultSkyNames"> - A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality - </floater.string> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="KeyFramePresetsText" - top="34" - width="85"> - Sky Presets: - </text> - <combo_box - height="23" - layout="topleft" - left_delta="85" - name="WLPresetsCombo" - top_delta="-4" - width="150" /> - <button - height="23" - label="New" - label_selected="New" - layout="topleft" - left_pad="3" - name="WLNewPreset" - width="70" /> - <button - height="23" - label="Save" - label_selected="Save" - layout="topleft" - left_pad="3" - name="WLSavePreset" - width="70" /> - <button - height="23" - label="Delete" - label_selected="Delete" - layout="topleft" - left_pad="3" - name="WLDeletePreset" - width="70" /> - <button - height="23" - label="Day Cycle Editor" - label_selected="Day Cycle Editor" - layout="topleft" - right="-10" - name="WLDayCycleMenuButton" - top_pad="-23" - width="120" /> - <tab_container - follows="left|top" - height="196" - halign="center" - layout="topleft" - left="0" - name="WindLight Tabs" - tab_position="top" - top="60" +<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true" + can_resize="false" height="220" left="50" min_height="180" + min_width="400" mouse_opaque="true" name="WindLight floater" + rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor" width="700"> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="ATMOSPHERE" - layout="topleft" - left="1" - mouse_opaque="false" - help_topic="windlight_atmosphere_tab" - name="Atmosphere" - top="60" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="BHText" - top="4" - width="355"> - Blue Horizon - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - name="BHText2" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueHorizonR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueHorizonR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="10" - top_pad="-15" - name="BHText3" - width="10"> - G - </text> - <slider - control_name="WLBlueHorizonG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueHorizonG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText4" - left="10" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueHorizonB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - name="WLBlueHorizonB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - name="BHText5" - left="10" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueHorizonI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - name="WLBlueHorizonI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - top_pad="-10" - name="BDensText" - width="355"> - Haze Horizon - </text> - <slider - control_name="WLHazeHorizon" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - layout="topleft" - left="23" - top_delta="0" - top_pad="27" - name="WLHazeHorizon" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="BDensText2" - top="4" - width="355"> - Blue Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText6" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLBlueDensityR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLBlueDensityR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText7" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLBlueDensityG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText8" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLBlueDensityB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLBlueDensityB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left="245" - name="BHText9" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLBlueDensityI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLBlueDensityI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="HDText" - top_pad="-10" - width="355"> - Haze Density - </text> - <slider - control_name="WLHazeDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left="258" - max_val="4" - name="WLHazeDensity" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="DensMultText" - top="4" - width="355"> - Density Multiplier - </text> - <slider - control_name="WLDensityMult" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - layout="topleft" - left_delta="13" - max_val="0.9" - name="WLDensityMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLDistanceMultText" - top_pad="-10" - width="355"> - Distance Multiplier - </text> - <slider - control_name="WLDistancMult" - decimal_digits="1" - follows="left" - height="10" - initial_value="1.0" - layout="topleft" - left_delta="13" - max_val="100" - name="WLDistanceMult" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="MaxAltText" - top_pad="-15" - width="355"> - Max Altitude - </text> - <slider - control_name="WLMaxAltitude" - decimal_digits="0" - follows="left" - height="10" - increment="1" - initial_value="500" - layout="topleft" - left_delta="13" - max_val="4000" - name="WLMaxAltitude" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="LIGHTING" - layout="topleft" - left_delta="0" - help_topic="windlight_lighting_tab" - name="Lighting" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="SLCText" - top="4" - width="355"> - Sun/Moon Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLSunlightR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLSunlightR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLSunlightG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLSunlightB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLSunlightB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLSunlightI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLSunlightI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="TODText" - top_pad="-10" - width="355"> - Sun/Moon Position - </text> - <icon - height="20" - image_name="icon_diurnal.tga" - layout="topleft" - left_delta="14" - top_pad="10" - name="SkyDayCycle" - width="148" /> - <slider - control_name="WLSunAngle" - follows="left" - height="10" - increment="0.001" - initial_value="0.7" - layout="topleft" - left_delta="-8" - name="WLSunAngle" - top_pad="20" - width="207" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLAmbientText" - top="4" - width="355"> - Ambient - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLAmbientR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLAmbientR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLAmbientG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLAmbientB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLAmbientB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText8" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLAmbientI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1" - layout="topleft" - left_delta="0" - name="WLAmbientI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLEastAngleText" - top_pad="-10" - width="355"> - East Angle - </text> - <slider - control_name="WLEastAngle" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.0" - layout="topleft" - left_delta="13" - name="WLEastAngle" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="SunGlowText" - top="4" - width="355"> - Sun Glow - </text> - <slider - control_name="WLGlowB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.1" - label="Focus " - layout="topleft" - left_delta="0" - max_val="0.5" - name="WLGlowB" - top_pad="27" - width="200" /> - <slider - control_name="WLGlowR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.25" - label="Size " - layout="topleft" - left_delta="0" - max_val="1.99" - min_val="1" - name="WLGlowR" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="SceneGammaText" - top_pad="-10" - width="200"> - Scene Gamma - </text> - <slider - control_name="WLGamma" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="2.0" - layout="topleft" - left_delta="0" - max_val="10" - name="WLGamma" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="0" - name="WLStarText" - top_pad="-10" - width="355"> - Star Brightness - </text> - <slider - control_name="WLStarAlpha" - decimal_digits="2" - follows="bottom" - height="10" - increment="0.01" - initial_value="0" - layout="topleft" - left_delta="0" - max_val="2" - name="WLStarAlpha" - top_pad="27" - width="200" /> - </panel> - <panel - border="true" - follows="left|top|right|bottom" - height="196" - label="CLOUDS" - layout="topleft" - left_delta="0" - mouse_opaque="false" - help_topic="windlight_clouds_tab" - name="Clouds" - top_delta="4" - width="698"> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="10" - name="WLCloudColorText" - top="4" - width="355"> - Cloud Color - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText" - top_pad="5" - width="10"> - R - </text> - <slider - control_name="WLCloudColorR" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudColorR" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText2" - top_pad="-15" - width="10"> - G - </text> - <slider - control_name="WLCloudColorG" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorG" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText3" - top_pad="-15" - width="10"> - B - </text> - <slider - control_name="WLCloudColorB" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.7" - layout="topleft" - left_delta="0" - name="WLCloudColorB" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText4" - top_pad="-15" - width="10"> - I - </text> - <slider - control_name="WLCloudColorI" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudColorI" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudColorText2" - top_pad="-10" - width="355"> - Cloud XY/Density - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText5" - top_pad="5" - width="10"> - X - </text> - <slider - control_name="WLCloudX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText6" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="6" - name="WLCloudY" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText7" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="245" - name="WLCloudCoverageText" - top="4" - width="355"> - Cloud Coverage - </text> - <slider - control_name="WLCloudCoverage" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="13" - name="WLCloudCoverage" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudScaleText" - top_pad="-10" - width="355"> - Cloud Scale - </text> - <slider - control_name="WLCloudScale" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="13" - min_val="0.01" - name="WLCloudScale" - top_pad="27" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-13" - name="WLCloudDetailText" - top_pad="-10" - width="355"> - Cloud Detail (XY/Density) - </text> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="0" - name="BHText8" - top_pad="8" - width="10"> - X - </text> - <slider - control_name="WLCloudDetailX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_pad="3" - top_pad="8" - name="WLCloudDetailX" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText9" - top_pad="-15" - width="10"> - Y - </text> - <slider - control_name="WLCloudDetailY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left_delta="0" - name="WLCloudDetailY" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - halign="center" - height="16" - layout="topleft" - left_delta="-13" - name="BHText10" - top_pad="-15" - width="10"> - D - </text> - <slider - control_name="WLCloudDetailDensity" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="1.0" - layout="topleft" - left_delta="0" - name="WLCloudDetailDensity" - left_pad="3" - top_pad="6" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left="480" - name="WLCloudScrollXText" - top="4" - width="355"> - Cloud Scroll X - </text> - <check_box - control_name="WLCloudLockX" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockX" - width="200" /> - <slider - control_name="WLCloudScrollX" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollX" - top="45" - width="200" /> - <text - type="string" - length="1" - follows="left|top|right" - font="SansSerif" - height="16" - layout="topleft" - left_delta="-14" - name="WLCloudScrollYText" - top_delta="-1" - width="355"> - Cloud Scroll Y - </text> - <check_box - control_name="WLCloudLockY" - follows="left" - height="16" - label="Lock" - layout="topleft" - left="625" - name="WLCloudLockY" - width="200" /> - <slider - control_name="WLCloudScrollY" - decimal_digits="2" - follows="left" - height="10" - increment="0.01" - initial_value="0.5" - layout="topleft" - left="494" - max_val="10" - min_val="-10" - name="WLCloudScrollY" - top="85" - width="200" /> - <check_box - control_name="DrawClassicClouds" - follows="left" - height="16" - label="Draw Classic Clouds" - layout="topleft" - left="480" - name="DrawClassicClouds" - top="104" - width="200" /> - </panel> - </tab_container> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-50" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0" + width="110"> + Sky Presets: + </text> + <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18" + left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo" + width="150" /> + <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20" + label="New" label_selected="New" left_delta="170" + mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" /> + <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" + label="Save" label_selected="Save" left_delta="80" + mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" /> + <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" + label="Delete" label_selected="Delete" left_delta="80" + mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" /> + <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20" + label="Day Cycle Editor" label_selected="Day Cycle Editor" + left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton" + scale_image="true" width="120" /> + <tab_container bottom="-220" follows="left|top" height="160" left="0" + mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700"> + <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160" + label="Atmosphere" left="1" mouse_opaque="false" + name="Atmosphere" width="698"> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355"> + Blue Horizon + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLBlueHorizonHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-37" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10"> + R + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10"> + G + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10"> + B + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10"> + I + </text> + <slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355"> + Haze Horizon + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLHazeHorizonHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.25" label="" left="24" max_val="1.0" min_val="0" + mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355"> + Blue Density + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLBlueDensityHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-37" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10"> + R + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10"> + G + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10"> + B + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10"> + I + </text> + <slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355"> + Haze Density + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLHazeDensityHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="4" min_val="0" + mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355"> + Density Multiplier + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLDensityMultHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.1" label="" left="494" max_val="0.9" min_val="0" + mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-53" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0" + width="355"> + Distance Multiplier + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLDistanceMultHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult" + decimal_digits="1" follows="left" height="10" increment="0.1" + initial_val="1.0" label="" left="494" max_val="100" min_val="0" + mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0" + width="207" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355"> + Max Altitude + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLMaxAltitudeHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude" + decimal_digits="0" follows="left" height="10" increment="1" + initial_val="500" label="" left="494" max_val="4000" min_val="0" + mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000" + width="205" /> + </panel> + <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160" + label="Lighting" left="1" mouse_opaque="true" + name="Lighting" width="698"> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355"> + Sun/Moon Color + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLSunlightColorHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-37" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10"> + R + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10"> + G + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10"> + B + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10"> + I + </text> + <slider bottom="-50" can_edit_text="false" control_name="WLSunlightR" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355"> + Sun/Moon Position + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLTimeOfDayHelp" width="18" /> + <icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga" + left="30" name="SkyDayCycle" width="148" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle" + decimal_digits="3" follows="left" height="10" increment="0.001" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0" + width="204" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355"> + Ambient + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLAmbientHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-37" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10"> + R + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10"> + G + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10"> + B + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10"> + I + </text> + <slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2" + follows="left" height="10" increment="0.01" initial_val="0.7" label="" + left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR" + show_text="true" value="1.0" width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355"> + East Angle + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLEastAngleHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.0" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355"> + Sun Glow + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLSunGlowHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0" + mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.25" label="Size " left="494" max_val="1.99" min_val="1" + mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-67" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200"> + Scene Gamma + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLSceneGammaHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma" + decimal_digits="2" follows="bottom" height="10" increment="0.01" + initial_val="2.0" label="" left="494" max_val="10.0" min_val="0" + mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-102" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355"> + Star Brightness + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="630" name="WLStarBrightnessHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha" + decimal_digits="2" follows="bottom" height="10" increment="0.01" + initial_val="0" label="" left="494" max_val="2" min_val="0" + mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0" + width="200" /> + </panel> + <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160" + label="Clouds" left="1" mouse_opaque="false" name="Clouds" + width="698"> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355"> + Cloud Color + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLCloudColorHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-37" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10"> + R + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10"> + G + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10"> + B + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10"> + I + </text> + <slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.7" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0" + width="355"> + Cloud XY/Density + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="160" name="WLCloudDensityHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-103" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10"> + X + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10"> + Y + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10"> + D + </text> + <slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2" + follows="left" height="10" increment="0.01" initial_val="0.5" label="" + left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX" + show_text="true" value="0.5" width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="24" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0" + width="355"> + Cloud Coverage + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLCloudCoverageHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-55" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0" + width="355"> + Cloud Scale + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLCloudScaleHelp" width="18" /> + <slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01" + mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-87" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0" + width="355"> + Cloud Detail (XY/Density) + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="395" name="WLCloudDetailHelp" width="18" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-103" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10"> + X + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10"> + Y + </text> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right" + font="SansSerifSmall" h_pad="0" halign="center" height="16" + left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10"> + D + </text> + <slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5" + width="200" /> + <slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="1.0" label="" left="259" max_val="1" min_val="0" + mouse_opaque="true" name="WLCloudDetailDensity" show_text="true" + value="1.0" width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-20" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0" + width="355"> + Cloud Scroll X + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="605" name="WLCloudScrollXHelp" width="18" /> + <check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16" + initial_value="false" label="Lock" left="625" mouse_opaque="true" + name="WLCloudLockX" width="200" /> + <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="494" max_val="10" min_val="-10" + mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0" + width="200" /> + <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" + bottom="-60" drop_shadow_visible="true" follows="left|top|right" + font="SansSerif" h_pad="0" halign="left" height="16" + left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0" + width="355"> + Cloud Scroll Y + </text> + <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="605" name="WLCloudScrollYHelp" width="18" /> + <check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16" + initial_value="false" label="Lock" left="625" mouse_opaque="true" + name="WLCloudLockY" width="200" /> + <slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY" + decimal_digits="2" follows="left" height="10" increment="0.01" + initial_val="0.5" label="" left="494" max_val="10" min_val="-10" + mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0" + width="200" /> + <check_box bottom="-120" control_name="DrawClassicClouds" follows="left" + font="SansSerifSmall" height="16" initial_value="false" + label="Draw Classic Clouds" left="480" mouse_opaque="true" + name="DrawClassicClouds" width="200" /> + <button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?" + left="608" name="WLClassicCloudsHelp" width="18" /> + </panel> + </tab_container> + <string name="WLDefaultSkyNames"> + A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality + </string> </floater> |