summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llenvironment.cpp2
-rw-r--r--indra/newview/llpaneleditsky.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml14
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_settings_water.xml24
6 files changed, 34 insertions, 32 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 1b38fceef7..5abb1b2e55 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -880,7 +880,7 @@ void LLEnvironment::updateCloudScroll()
if (mCurrentEnvironment->getSky() && !mCloudScrollPaused)
{
- LLVector2 cloud_delta = static_cast<F32>(delta_t)* (mCurrentEnvironment->getSky()->getCloudScrollRate() - LLVector2(10.0, 10.0)) / 100.0;
+ LLVector2 cloud_delta = static_cast<F32>(delta_t)* (mCurrentEnvironment->getSky()->getCloudScrollRate()) / 100.0;
mCloudScrollDelta += cloud_delta;
}
diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp
index 1b41529795..0d36fce90a 100644
--- a/indra/newview/llpaneleditsky.cpp
+++ b/indra/newview/llpaneleditsky.cpp
@@ -96,8 +96,6 @@ namespace
const F32 SLIDER_SCALE_BLUE_HORIZON_DENSITY(2.0f);
const F32 SLIDER_SCALE_GLOW_R(20.0f);
const F32 SLIDER_SCALE_GLOW_B(-5.0f);
-
- const LLVector2 CLOUD_SCROLL_ADJUST(10, 10);
}
static LLPanelInjector<LLPanelSettingsSkyAtmosTab> t_settings_atmos("panel_settings_atmos");
@@ -300,7 +298,6 @@ void LLPanelSettingsSkyCloudTab::refresh()
getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCALE)->setValue(mSkySettings->getCloudScale());
LLVector2 cloudScroll(mSkySettings->getCloudScrollRate());
- cloudScroll -= CLOUD_SCROLL_ADJUST;
getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCROLL_XY)->setValue(cloudScroll.getValue());
getChild<LLTextureCtrl>(FIELD_SKY_CLOUD_MAP)->setValue(mSkySettings->getCloudNoiseTextureId());
@@ -340,7 +337,6 @@ void LLPanelSettingsSkyCloudTab::onCloudScaleChanged()
void LLPanelSettingsSkyCloudTab::onCloudScrollChanged()
{
LLVector2 scroll(getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCROLL_XY)->getValue());
- scroll += CLOUD_SCROLL_ADJUST;
mSkySettings->setCloudScrollRate(scroll);
setIsDirty();
}
@@ -356,7 +352,7 @@ void LLPanelSettingsSkyCloudTab::onCloudDensityChanged()
LLColor3 density(getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_X)->getValue().asReal(),
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_Y)->getValue().asReal(),
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_D)->getValue().asReal());
-
+
mSkySettings->setCloudPosDensity1(density);
setIsDirty();
}
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
index fd66df0f74..8ef96009d4 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
@@ -119,7 +119,7 @@
layout="topleft"
left_delta="5"
min_val="0"
- max_val="1"
+ max_val="5"
name="haze_horizon"
top_delta="20"
width="207"
@@ -142,7 +142,7 @@
layout="topleft"
left_delta="5"
min_val="0"
- max_val="1"
+ max_val="5"
name="haze_density"
top_delta="20"
width="207"
@@ -164,7 +164,7 @@
initial_value="0"
layout="topleft"
left_delta="5"
- max_val="10"
+ max_val="20"
name="scene_gamma"
top_delta="20"
width="214"
@@ -195,7 +195,7 @@
layout="topleft"
left_delta="5"
min_val="0.0001"
- max_val="0.9"
+ max_val="2"
name="density_multip"
top_delta="20"
width="207"
@@ -218,7 +218,7 @@
layout="topleft"
left_delta="5"
min_val="0"
- max_val="100"
+ max_val="1000"
name="distance_multip"
top_delta="20"
width="219"
@@ -241,7 +241,7 @@
layout="topleft"
left_delta="5"
min_val="0"
- max_val="4000"
+ max_val="10000"
name="max_alt"
top_delta="20"
width="219"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
index 412ed8bf82..568345e01f 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
@@ -83,7 +83,7 @@
layout="topleft"
left_delta="5"
min_val="0"
- max_val="1"
+ max_val="3"
name="cloud_scale"
top_delta="20"
width="214"
@@ -105,10 +105,10 @@
visible="true"
left_delta="0"
top_delta="21"
- min_val_x="-10"
- max_val_x="10"
- min_val_y="-10"
- max_val_y="10" />
+ min_val_x="-30"
+ max_val_x="30"
+ min_val_y="-30"
+ max_val_y="30" />
<text
follows="left|top"
@@ -183,7 +183,7 @@
layout="topleft"
left_delta="0"
min_val="0"
- max_val="1"
+ max_val="3"
name="cloud_density_d"
top_delta="20"
width="200"
@@ -237,7 +237,7 @@
layout="topleft"
left_delta="0"
min_val="0"
- max_val="1"
+ max_val="2"
name="cloud_detail_d"
top_delta="20"
width="200"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
index 841a8c3199..bc267bb7b9 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
@@ -124,8 +124,8 @@
initial_value="0"
layout="topleft"
left_delta="5"
- min_val="0"
- max_val="0.5"
+ min_val="-2"
+ max_val="2"
name="glow_focus"
top_delta="15"
width="250"
@@ -147,8 +147,8 @@
initial_value="0"
layout="topleft"
left_delta="5"
- min_val="1"
- max_val="1.99"
+ min_val="0"
+ max_val="2"
name="glow_size"
top_delta="15"
width="250"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 4c9ae57941..d88195bf48 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -68,6 +68,7 @@
initial_value="0"
layout="top"
left_delta="15"
+ min_val="-10"
max_val="10"
name="water_fog_density"
top_delta="5"
@@ -190,11 +191,11 @@
visible="true"
left_delta="0"
top_delta="21"
- min_val_x="-4"
- max_val_x="4"
+ min_val_x="-20"
+ max_val_x="20"
increment_x="0.5f"
- min_val_y="-4"
- max_val_y="4"
+ min_val_y="-20"
+ max_val_y="20"
increment_y="0.5f"
arrow_color="white"/>
@@ -214,10 +215,10 @@
visible="true"
left_delta="0"
top_delta="21"
- min_val_x="-4"
- max_val_x="4"
- min_val_y="-4"
- max_val_y="4"
+ min_val_x="-20"
+ max_val_x="20"
+ min_val_y="-20"
+ max_val_y="20"
arrow_color="white"/>
<text
@@ -306,6 +307,8 @@
height="16"
layout="topleft"
left_delta="5"
+ min_val="0"
+ max_val="3"
name="water_scale_above"
top_pad="5"
width="200"
@@ -330,6 +333,8 @@
initial_value="0"
layout="topleft"
left_delta="5"
+ min_val="0"
+ max_val="3"
name="water_scale_below"
top_pad="5"
width="200"
@@ -352,7 +357,8 @@
initial_value="0"
layout="topleft"
left_delta="5"
- max_val="0.16"
+ min_val="-0.5"
+ max_val="0.5"
name="water_blur_multip"
top_pad="5"
width="200"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 07:53:24 +0000