summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-09-04 23:47:52 +0100
committerGraham Linden <graham@lindenlab.com>2018-09-04 23:47:52 +0100
commit5db0338aceebb04cd143a71f393f15dfebe8ad3a (patch)
tree1b9b848d0ced2c518db266b648d51ac2cc72a4ac /indra
parent94d844e1876461ad2e2ad385555ce9a0a7e60088 (diff)
Put back less debuggable but more terse accum of update conditions.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvosky.cpp20
1 files changed, 3 insertions, 17 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index e02550c77b..b52b8f1587 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -642,23 +642,9 @@ bool LLVOSky::updateSky()
bool light_direction_changed = (dot_lighting < LIGHT_DIRECTION_THRESHOLD);
bool color_changed = (delta_color.length() >= COLOR_CHANGE_THRESHOLD);
- if (light_direction_changed)
- {
- mForceUpdate = true;
- }
-
- if (color_changed)
- {
- mForceUpdate = true;
- }
-
- if (!mInitialized)
- {
- mForceUpdate = true;
- }
- //mForceUpdate = mForceUpdate || light_direction_changed;
- //mForceUpdate = mForceUpdate || color_changed;
- //mForceUpdate = mForceUpdate || !mInitialized;
+ mForceUpdate = mForceUpdate || light_direction_changed;
+ mForceUpdate = mForceUpdate || color_changed;
+ mForceUpdate = mForceUpdate || !mInitialized;
if (mForceUpdate && mForceUpdateThrottle.hasExpired())
{