summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-09-18 17:38:06 +0300
committermaxim_productengine <mnikolenko@productengine.com>2018-09-18 17:38:06 +0300
commite53d35f4e8c9e15eda75f960b253481e1447b2b1 (patch)
tree0e339f06d062072327d11294d0939124b4d1643b /indra/newview
parentfb0212b85305638d50fe1309b8d3174ae57b0543 (diff)
SL-1258 FIXED [EEP] Custom cloud, sun & moon textures don't update when you apply a Windlight sky locally.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llenvironment.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 3b1990c850..ec2577d053 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -1768,6 +1768,8 @@ void LLEnvironment::DayTransition::animate()
if (!mBlenderSky && !mBlenderWater)
LLEnvironment::instance().mCurrentEnvironment = mNextInstance;
+ else
+ setWater(mNextInstance->getWater());
});
mSky = mStartSky->buildClone();
@@ -1778,6 +1780,8 @@ void LLEnvironment::DayTransition::animate()
if (!mBlenderSky && !mBlenderWater)
LLEnvironment::instance().mCurrentEnvironment = mNextInstance;
+ else
+ setSky(mNextInstance->getSky());
});
}