From 94c24b8713b72b6ce52637644ff18b234a3a400a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 23 Aug 2018 20:14:15 +0300
Subject: MAINT-8944 Fix frame transition's images

---
 indra/llinventory/llsettingswater.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'indra/llinventory/llsettingswater.cpp')

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
-- 
cgit v1.2.3