diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-24 15:57:56 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-24 15:57:56 +0000 |
| commit | 6bff7d786e10f19c3fe3560f7628fb2b17d369a3 (patch) | |
| tree | 4f07b8e22b668d4ce4f02d65abf2c5976c293ab9 | |
| parent | 92dc9ceb834dd31aa6fe1c67b9ea896a62cd7c7c (diff) | |
| parent | f0eb06ed13313e3c5a78224506cde7a894591880 (diff) | |
Merged in andreyl_productengine/viewer-eep-marchcat (pull request #108)
SL-1546 + line endings fix
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml | 2 |
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" |