summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/lldrawpoolwater.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index 56f3b75792..7a25e62651 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -721,7 +721,7 @@ void LLDrawPoolWater::shade()
// using squash clip for deferred rendering makes the horizon lines match
// between ALM and non-ALM rendering (SL-1655), but introduces an ugly seem between
// near and far water(SL-9696)...we're going to live with the former and not cause the latter
- else if (gGLManager.mHasDepthClamp || deferred_render)
+ else if (gGLManager.mHasDepthClamp || deferred_render)
{
face->renderIndexed();
}
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 0e729c821a..9fa77855c0 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
@@ -5,7 +5,7 @@
height="150"
user_resize="false"
increment_angle_mouse="1.5f"
- increment_angle_btn="3.0f"
+ increment_angle_btn="1.0f"
image_sphere="VirtualTrackball_Sphere"
image_moon_back="VirtualTrackball_Moon_Back"
image_moon_front="VirtualTrackball_Moon_Front"