viewer#2889 Fix water's normal map being ignored

akleshchev · akleshchev · commit cbd713037e56 · 2024-10-31T22:58:14.000+02:00
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ void LLSettingsWater::loadValuesFromLLSD()`
`133`	`133`	`mWave1Dir = LLVector2(settings[SETTING_WAVE1_DIR]);`
`134`	`134`	`mWave2Dir = LLVector2(settings[SETTING_WAVE2_DIR]);`
`135`	`135`
`136`		`- mNormalMapID = getNormalMapID();`
`137`		`- mTransparentTextureID = getTransparentTextureID();`
	`136`	`+ mNormalMapID = settings[SETTING_NORMAL_MAP].asUUID();`
	`137`	`+ mTransparentTextureID = settings[SETTING_TRANSPARENT_TEXTURE].asUUID();`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`void LLSettingsWater::saveValuesToLLSD()`