summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llsettingssky.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index 95502f47c3..a6f0d06e7d 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -364,7 +364,9 @@ LLSettingsSky::LLSettingsSky(const LLSD &data) :
LLSettingsBase(data),
mNextSunTextureId(),
mNextMoonTextureId(),
- mNextCloudTextureId()
+ mNextCloudTextureId(),
+ mPositionsDirty(true),
+ mLightingDirty(true)
{
}
@@ -372,13 +374,15 @@ LLSettingsSky::LLSettingsSky():
LLSettingsBase(),
mNextSunTextureId(),
mNextMoonTextureId(),
- mNextCloudTextureId()
+ mNextCloudTextureId(),
+ mPositionsDirty(true),
+ mLightingDirty(true)
{
}
void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf)
{
- LLSettingsSky::ptr_t other((LLSettingsSky*)end.get());
+ LLSettingsSky::ptr_t other = PTR_NAMESPACE::dynamic_pointer_cast<LLSettingsSky>(end);
LLSD blenddata = interpolateSDMap(mSettings, other->mSettings, blendf);
replaceSettings(blenddata);