diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-06-25 14:44:09 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-06-25 14:44:09 -0700 |
| commit | d25f80181463d373c317835a219903bcdf9b91c8 (patch) | |
| tree | 78f9c09c7519ba0af5bd51fcbfb3b409a74e127e /indra/newview/llenvironment.cpp | |
| parent | 4356b8dc0ea7754ce643596d99f3f051a8f8917a (diff) | |
Fix cloud scroll adjustment in the editor, pause clouds method, set sun disk UUID to null.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index e3a030225d..94605dc062 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -258,6 +258,8 @@ const F32 LLEnvironment::SUN_DELTA_YAW(F_PI); // 180deg //------------------------------------------------------------------------- LLEnvironment::LLEnvironment(): + mCloudScrollDelta(), + mCloudScrollPaused(false), mSelectedSky(), mSelectedWater(), mSelectedDay(), @@ -851,7 +853,7 @@ void LLEnvironment::updateCloudScroll() F64 delta_t = s_cloud_timer.getElapsedTimeAndResetF64(); - if (mCurrentEnvironment->getSky()) + if (mCurrentEnvironment->getSky() && !mCloudScrollPaused) { LLVector2 cloud_delta = static_cast<F32>(delta_t)* (mCurrentEnvironment->getSky()->getCloudScrollRate() - LLVector2(10.0, 10.0)) / 100.0; mCloudScrollDelta += cloud_delta; |