summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneleditwater.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-01-17 20:06:56 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-01-24 17:40:01 +0200
commit869712e273caa0a655f7b6a1f189a8bc6399f51d (patch)
tree678daba479ef02d39e3bb0848f48661bd2857b4f /indra/newview/llpaneleditwater.cpp
parent79f5231db23dfa22d8981940864d1f3a450e3e02 (diff)
SL-20669 Move constants out of settings.xml
UIImgInvisibleUUID doesn't exist Default normal for material is 'null'
Diffstat (limited to 'indra/newview/llpaneleditwater.cpp')
-rw-r--r--indra/newview/llpaneleditwater.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp
index a09964e17d..cf536dd87e 100644
--- a/indra/newview/llpaneleditwater.cpp
+++ b/indra/newview/llpaneleditwater.cpp
@@ -89,7 +89,7 @@ BOOL LLPanelSettingsWaterMainTab::postBuild()
getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogUnderWaterChanged(); });
mTxtNormalMap->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId());
- mTxtNormalMap->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" )));
+ mTxtNormalMap->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
mTxtNormalMap->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); });
getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSmallWaveChanged(); });