diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-10-31 21:27:58 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-10-31 22:58:14 +0200 |
| commit | cbd713037e5636b9f3c360332e23e0e29d2972ce (patch) | |
| tree | 585c88fc2ed6c14947a18a181b337fe0ac90c800 | |
| parent | 8dfc1d0447bae8afd1567abf85ecbec9b43790a0 (diff) | |
viewer#2889 Fix water's normal map being ignored
| -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 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() |