diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-09-14 00:11:03 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-09-14 00:11:03 +0100 |
| commit | 46d194d352a7da88e7a9c96fba404c61a1bddb89 (patch) | |
| tree | 49d3b892cc20bae1e4391883e64b0337e3f5116d /indra/newview | |
| parent | 2f9d08f48d879b1f8929cff513fe07359e80043d (diff) | |
SL-1872 make daycycle water editor normal map texture control use proper blank normal map asset
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp index bf00ee34f9..5d7c6f3943 100644 --- a/indra/newview/llpaneleditwater.cpp +++ b/indra/newview/llpaneleditwater.cpp @@ -32,6 +32,7 @@ #include "lltexturectrl.h" #include "llcolorswatch.h" #include "llxyvector.h" +#include "llviewercontrol.h" namespace { @@ -88,6 +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->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); }); getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSmallWaveChanged(); }); |