summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llinventory/llsettingswater.cpp4
1 files changed, 2 insertions, 2 deletions
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()