diff options
8 files changed, 17 insertions, 14 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index f744e9db41..9052bc7d1d 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -511,7 +511,7 @@ void LLMultiSlider::draw() mIt->second.mTop + extra_triangle_height, mIt->second.mLeft + mIt->second.getWidth() / 2, mIt->second.mBottom - extra_triangle_height, - mTriangleColor.get(), TRUE); + mTriangleColor.get() % opacity, TRUE); } } else if (!thumb_imagep) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 72edbb379f..505f3ed767 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10812,7 +10812,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <real>-2</real> + <real>-1</real> </map> <key>UIExtraTriangleWidth</key> <map> @@ -10823,7 +10823,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <real>2</real> + <real>4</real> </map> <key>UIFloaterCloseBoxSize</key> <map> diff --git a/indra/newview/llfloatereditdaycycle.cpp b/indra/newview/llfloatereditdaycycle.cpp index 36f71d6161..28ff353369 100644 --- a/indra/newview/llfloatereditdaycycle.cpp +++ b/indra/newview/llfloatereditdaycycle.cpp @@ -256,6 +256,7 @@ void LLFloaterEditDayCycle::refreshDayCyclesList() mDayCyclesCombo->removeall(); +#if 0 // Disable editing existing day cycle until the workflow is clear enough. const LLSD& region_day = LLEnvManagerNew::instance().getRegionSettings().getWLDayCycle(); if (region_day.size() > 0) { @@ -263,6 +264,7 @@ void LLFloaterEditDayCycle::refreshDayCyclesList() mDayCyclesCombo->add(key.name, key.toLLSD()); mDayCyclesCombo->addSeparator(); } +#endif const LLDayCycleManager::dc_map_t& map = LLDayCycleManager::instance().getPresets(); for (LLDayCycleManager::dc_map_t::const_iterator it = map.begin(); it != map.end(); ++it) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 973df6998a..b0628dfe67 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -500,22 +500,22 @@ reference="DkGray2" /> <color name="MultiSliderDisabledThumbColor" - reference="Unused?" /> + reference="Black" /> <color name="MultiSliderThumbCenterColor" - reference="Unused?" /> + reference="White" /> <color name="MultiSliderThumbCenterSelectedColor" - reference="Unused?" /> + reference="Green" /> <color name="MultiSliderThumbOutlineColor" reference="Unused?" /> <color name="MultiSliderTrackColor" - reference="Unused?" /> + reference="LtGray" /> <color name="MultiSliderTriangleColor" - reference="Unused?" /> + reference="Yellow" /> <!-- <color name="NameTagBackground" diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index 6cfa67f766..b93406053c 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -4,7 +4,7 @@ height="450" layout="topleft" name="Edit Day cycle" - help_topic="" + help_topic="day_presets" save_rect="true" title="Edit Day Cycle" width="800"> diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml index ae7e83ee56..6ffb3480ad 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml @@ -4,7 +4,7 @@ height="375" layout="topleft" name="Edit Sky Preset" - help_topic="" + help_topic="sky_preset" save_rect="true" title="Edit Sky Preset" width="900"> @@ -98,7 +98,7 @@ layout="topleft" left="1" mouse_opaque="false" - help_topic="windlight_atmosphere_tab" + help_topic="sky_preset_atmosphere" name="Atmosphere" top="60" width="698"> @@ -379,7 +379,7 @@ label="LIGHTING" layout="topleft" left_delta="0" - help_topic="windlight_lighting_tab" + help_topic="sky_preset_lighting" name="Lighting" top_delta="4" width="698"> @@ -685,7 +685,7 @@ layout="topleft" left_delta="0" mouse_opaque="false" - help_topic="windlight_clouds_tab" + help_topic="sky_preset_clouds" name="Clouds" top_delta="4" width="698"> diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml index cf4e224835..f107e67f74 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml @@ -4,7 +4,7 @@ height="450" layout="topleft" name="Edit Water Preset" - help_topic="" + help_topic="water_preset" save_rect="true" title="Edit Water Preset" width="900"> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index caa12010ca..5bcc19356d 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -5,6 +5,7 @@ height="300" label="Environment" layout="topleft" + help_topic="panel_region_environment_tab" name="panel_env_info" width="530"> <text |