summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingswater.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-08-23 20:14:15 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-08-23 20:14:15 +0300
commit94c24b8713b72b6ce52637644ff18b234a3a400a (patch)
treeb5eaf353da77d933a297a36f01635acb56c95da0 /indra/llinventory/llsettingswater.cpp
parentd7c687b62f901d40c061535e93bca278574163a5 (diff)
MAINT-8944 Fix frame transition's images
Diffstat (limited to 'indra/llinventory/llsettingswater.cpp')
-rw-r--r--indra/llinventory/llsettingswater.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index f0d63bf033..652e211ac4 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -185,10 +185,16 @@ void LLSettingsWater::blend(const LLSettingsBase::ptr_t &end, F64 blendf)
}
else
{
- LL_WARNS("SETTINGS") << "Cound not cast end settings to water. No blend performed." << LL_ENDL;
+ LL_WARNS("SETTINGS") << "Could not cast end settings to water. No blend performed." << LL_ENDL;
}
setBlendFactor(blendf);
- mNextNormalMapID = other->getNormalMapID();
+}
+
+void LLSettingsWater::replaceSettings(LLSD settings)
+{
+ LLSettingsBase::replaceSettings(settings);
+ mNextNormalMapID.setNull();
+ mNextTransparentTextureID.setNull();
}
LLSettingsWater::validation_list_t LLSettingsWater::getValidationList() const