diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-04-30 16:37:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-04-30 16:37:08 -0700 |
| commit | 438609699b838924becee89fa9d8ec83552f3236 (patch) | |
| tree | ba2ebdd1e2ce3680bd2c4c1fb1ebb6fecc926de0 /indra/newview/llpaneleditwater.cpp | |
| parent | cf0e4f79f52b4fb24769aa6e355ec8c95c6d2afc (diff) | |
New water settings dialog.
Diffstat (limited to 'indra/newview/llpaneleditwater.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp index 08ba198894..3cb1dcfda4 100644 --- a/indra/newview/llpaneleditwater.cpp +++ b/indra/newview/llpaneleditwater.cpp @@ -80,11 +80,12 @@ BOOL LLPanelSettingsWaterMainTab::postBuild() mClrFogColor = getChild<LLColorSwatchCtrl>(FIELD_WATER_FOG_COLOR); mTxtNormalMap = getChild<LLTextureCtrl>(FIELD_WATER_NORMAL_MAP); - mClrFogColor->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogColorChanged(); }); getChild<LLUICtrl>(FIELD_WATER_FOG_DENSITY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogDensityChanged(); }); // getChild<LLUICtrl>(FIELD_WATER_FOG_DENSITY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogDensityChanged(getChild<LLUICtrl>(FIELD_WATER_FOG_DENSITY)->getValue().asReal()); }); getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogUnderWaterChanged(); }); + + mTxtNormalMap->setDefaultImageAssetID(LLSettingsWater::DEFAULT_WATER_NORMAL_ID); mTxtNormalMap->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); }); getChild<LLUICtrl>(FIELD_WATER_WAVE1_X)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onLargeWaveChanged(); }); |