summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-07-10 19:09:45 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-07-10 19:09:45 +0300
commit01bdbdb6acb4e315cb7de811d6ecced41fa0f9a7 (patch)
tree54919094381880f2e4008948bbef17a0984dd1f6 /indra/newview
parentafdda55b8f6ad58c3e57185d3c352a923f4893aa (diff)
SL-11572 [EEP] Revert keyframe markers to dots
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml4
2 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 3870794c63..0cbee7a3a6 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -1145,9 +1145,6 @@ void LLFloaterEditExtDayCycle::selectTrack(U32 track_index, bool force )
mSkyTabLayoutContainer->setVisible(!show_water);
mWaterTabLayoutContainer->setVisible(show_water);
- std::string iconname = (show_water) ? "Inv_SettingsWater" : "Inv_SettingsSky";
-
- mFramesSlider->setSliderThumbImage(iconname);
updateSlider();
updateLabels();
}
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 1b5bd90748..4332e0565b 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -244,7 +244,7 @@
<multi_slider
decimal_digits="0"
follows="bottom"
- height="12"
+ height="10"
increment="0.005"
overlap_threshold="0.026"
loop_overlap="true"
@@ -255,8 +255,6 @@
max_val="1"
name="WLDayCycleFrames"
show_text="false"
- thumb_highlight_color="white"
- thumb_width="12"
top_pad="15"
width="525" />