diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
| commit | a1c2d021261d38de7dabd0863dd264ac3bf50523 (patch) | |
| tree | 3b09e4412ccac313dd93adff2d14d1c766b5686a /indra/newview/llpaneleditsky.cpp | |
| parent | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (diff) | |
| parent | 0a7bc35335666cc310ef900d4e4144c658b92522 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #273)
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
Diffstat (limited to 'indra/newview/llpaneleditsky.cpp')
| -rw-r--r-- | indra/newview/llpaneleditsky.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index b011522728..bbd1beb246 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -451,7 +451,7 @@ BOOL LLPanelSettingsSkySunMoonTab::postBuild() getChild<LLUICtrl>(FIELD_SKY_MOON_ROTATION)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonRotationChanged(); }); getChild<LLUICtrl>(FIELD_SKY_MOON_IMAGE)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonImageChanged(); }); getChild<LLTextureCtrl>(FIELD_SKY_MOON_IMAGE)->setDefaultImageAssetID(LLSettingsSky::GetDefaultMoonTextureId()); - getChild<LLTextureCtrl>(FIELD_SKY_MOON_IMAGE)->setBlankImageAssetID(LLUUID::null); + getChild<LLTextureCtrl>(FIELD_SKY_MOON_IMAGE)->setBlankImageAssetID(LLSettingsSky::GetDefaultMoonTextureId()); getChild<LLTextureCtrl>(FIELD_SKY_MOON_IMAGE)->setAllowNoTexture(TRUE); getChild<LLUICtrl>(FIELD_SKY_MOON_SCALE)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonScaleChanged(); }); getChild<LLUICtrl>(FIELD_SKY_MOON_BRIGHTNESS)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonBrightnessChanged(); }); |