summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-08-09 15:53:43 +0100
committerGraham Linden <graham@lindenlab.com>2018-08-09 15:53:43 +0100
commitfb13d9746d8aaf48e27f5eb80254abe17ce66019 (patch)
tree2d05bd3c76f0217883ed9f22897fad7f4456cf82 /indra/newview/skins/default/xui
parent126191ada56cf5daa694493a9ad5188beda11253 (diff)
parent133900d31a4f75621bad070043f5ef0125708a88 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml2
2 files changed, 2 insertions, 1 deletions
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 50212fdf80..5e38a289c9 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
@@ -240,6 +240,7 @@
height="10"
increment="0.005"
overlap_threshold="0.026"
+ loop_overlap="true"
initial_value="0"
layout="topleft"
left="10"
diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
index 68681b8228..3a9655b317 100644
--- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
+++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml
@@ -4,7 +4,7 @@
width="150"
height="150"
user_resize="false"
- increment_angle_mouse="0.5f"
+ increment_angle_mouse="1.5f"
increment_angle_btn="3.0f"
image_sphere="VirtualTrackball_Sphere"
image_moon_back="VirtualTrackball_Moon_Back"