summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/app_settings/settings.xml2
-rw-r--r--indra/newview/llenvmanager.cpp13
-rw-r--r--indra/newview/llfloaterregioninfo.cpp14
-rw-r--r--indra/newview/llfloaterwindlight.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/floater_day_cycle_options.xml27
5 files changed, 30 insertions, 28 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ca8a4ebc31..167fd7e90c 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11342,7 +11342,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>UseExternalBrowser</key>
<map>
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index 687f9974b1..c855d8597c 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -302,7 +302,18 @@ bool LLEnvManager::processIncomingMessage(const LLSD& unvalidated_content, const
if (valid)
{
- F32 sun_hour = LLPanelRegionTerrainInfo::instance()->getSunHour(); // this slider is kept up to date
+ F32 sun_hour = 0;
+ LLPanelRegionTerrainInfo* terrain_panel = LLPanelRegionTerrainInfo::instance();
+
+ if (terrain_panel)
+ {
+ sun_hour = terrain_panel->getSunHour(); // this slider is kept up to date
+ }
+ else
+ {
+ llwarns << "Cannot instantiate the terrain panel (exiting?)" << llendl;
+ }
+
LLWLParamManager::getInstance()->addAllSkies(scope, windlight_llsd[2]);
LLEnvironmentSettings newSettings(windlight_llsd[1], windlight_llsd[2], windlight_llsd[3], sun_hour);
mOrigSettingStore[scope] = newSettings;
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 085d118c52..2acb0936dc 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -92,6 +92,8 @@
const S32 TERRAIN_TEXTURE_COUNT = 4;
const S32 CORNER_COUNT = 4;
+#define TMP_DISABLE_WLES // STORM-1180
+
///----------------------------------------------------------------------------
/// Local class declaration
///----------------------------------------------------------------------------
@@ -1217,6 +1219,7 @@ BOOL LLPanelRegionTerrainInfo::postBuild()
childSetAction("upload_raw_btn", onClickUploadRaw, this);
childSetAction("bake_terrain_btn", onClickBakeTerrain, this);
+#ifdef TMP_DISABLE_WLES
// WL advanced buttons
childSetAction("EnvAdvancedSkyButton", onOpenAdvancedSky, this);
childSetAction("EnvAdvancedWaterButton", onOpenAdvancedWater, this);
@@ -1227,6 +1230,7 @@ BOOL LLPanelRegionTerrainInfo::postBuild()
childSetAction("WLRegionCancel", onCancelRegionWL, this);
childSetAction("WLRegionDefault", onSetRegionToDefaultWL, this);
childSetAction("WLCurrentApply", onApplyCurrentWL, this);
+#endif
return TRUE;
}
@@ -1264,17 +1268,27 @@ bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
void LLPanelRegionTerrainInfo::setEnvControls(bool available)
{
+#ifdef TMP_DISABLE_WLES
+ available = false;
+ getChild<LLUICtrl>("wl_settings_unavailable")->setValue("Temporarily disabled.");
+#endif
+
getChildView("EnvUseEstateTimeButton")->setVisible(available);
getChildView("EnvAdvancedSkyButton")->setVisible(available);
getChildView("EnvAdvancedWaterButton")->setVisible(available);
getChildView("WLRegionApply")->setVisible(available);
getChildView("WLRegionCancel")->setVisible(available);
getChildView("WLRegionDefault")->setVisible(available);
+ getChildView("WLCurrentApply")->setVisible(available);
getChildView("wl_settings_unavailable")->setVisible(!available);
}
void LLPanelRegionTerrainInfo::setCommitControls(bool available)
{
+#ifdef TMP_DISABLE_WLES
+ available = false;
+#endif
+
getChildView("WLRegionApply")->setEnabled(available);
getChildView("WLRegionCancel")->setEnabled(available);
refresh();
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index 73e237fa5c..34629ec5c4 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -188,7 +188,7 @@ void LLFloaterWindLight::initCallbacks(void)
childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL);
childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL);
childSetCommitCallback("WLDistanceMult", onFloatControlMoved, &param_mgr->mDistanceMult);
- //childSetCommitCallback("DrawClassicClouds", LLSavedSettingsGlue::setBOOL, (void*)&use_classic_clouds);
+ getChild<LLUICtrl>("DrawClassicClouds")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "SkyUseClassicClouds"));
// WL Top
childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL);
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..b54dc87d24 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
@@ -362,7 +362,7 @@
label_width="35"
layout="topleft"
left_delta="20"
- max_val="100"
+ max_val="23"
name="WLCurKeyHour"
top_pad="4"
width="74" />
@@ -420,31 +420,8 @@
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"
+ top_delta="71"
width="120">
Length of Cycle:
</text>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 03:56:02 +0000