From cbd713037e5636b9f3c360332e23e0e29d2972ce Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 31 Oct 2024 21:27:58 +0200
Subject: viewer#2889 Fix water's normal map being ignored

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

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

diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp
index b30dbfeac2..b5d59dc497 100644
--- a/indra/llinventory/llsettingswater.cpp
+++ b/indra/llinventory/llsettingswater.cpp
@@ -133,8 +133,8 @@ void LLSettingsWater::loadValuesFromLLSD()
     mWave1Dir = LLVector2(settings[SETTING_WAVE1_DIR]);
     mWave2Dir = LLVector2(settings[SETTING_WAVE2_DIR]);
 
-    mNormalMapID = getNormalMapID();
-    mTransparentTextureID = getTransparentTextureID();
+    mNormalMapID = settings[SETTING_NORMAL_MAP].asUUID();
+    mTransparentTextureID = settings[SETTING_TRANSPARENT_TEXTURE].asUUID();
 }
 
 void LLSettingsWater::saveValuesToLLSD()
-- 
cgit v1.2.3