diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-11-06 17:30:47 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-11-06 17:30:47 +0800 |
| commit | 5f3e7b7fb33160c3250d445f45214aa30130c9e7 (patch) | |
| tree | 35aae8ac630096462d5e2ae1aa37b3787e80de56 /indra/llinventory | |
| parent | 8af4df0022a484c3ea0b1fedb3a36235e2742e3b (diff) | |
| parent | 55732f7343fa574a8dfcbfd807e69b1fb56e9209 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llsettingswater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/llsettingswater.cpp b/indra/llinventory/llsettingswater.cpp index 191129d725..b8946dbdba 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() |