diff options
| author | Vir Linden <60274682+vir-linden@users.noreply.github.com> | 2024-04-24 16:02:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 16:02:42 -0400 |
| commit | a3602d660c89a10126946d9c789e454fbfbc34bd (patch) | |
| tree | 1cd70015b45a432f599036f181dd93c53c59393a /indra/newview/llpaneleditwater.cpp | |
| parent | 6ca4dfdb56d0107368a09af2b089c24d32e7108d (diff) | |
| parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) | |
Merge pull request #1323 from secondlife/main
Update from main
Diffstat (limited to 'indra/newview/llpaneleditwater.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 2 |
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(); }); |