From 6bb496625f4492fabd44bd0e86acb8b599df8c43 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Mon, 8 Oct 2018 20:27:10 +0300 Subject: SL-9746 [EEP] Local Texture options should work with EEP --- indra/newview/llpaneleditsky.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/llpaneleditsky.cpp') diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index 0d8c9a988a..972b849510 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -258,7 +258,6 @@ BOOL LLPanelSettingsSkyCloudTab::postBuild() getChild(FIELD_SKY_CLOUD_MAP)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onCloudMapChanged(); }); getChild(FIELD_SKY_CLOUD_MAP)->setDefaultImageAssetID(LLSettingsSky::GetDefaultCloudNoiseTextureId()); getChild(FIELD_SKY_CLOUD_MAP)->setAllowNoTexture(TRUE); - getChild(FIELD_SKY_CLOUD_MAP)->setAllowLocalTexture(FALSE); getChild(FIELD_SKY_CLOUD_DENSITY_X)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onCloudDensityChanged(); }); getChild(FIELD_SKY_CLOUD_DENSITY_Y)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onCloudDensityChanged(); }); @@ -348,7 +347,8 @@ void LLPanelSettingsSkyCloudTab::onCloudScrollChanged() void LLPanelSettingsSkyCloudTab::onCloudMapChanged() { - mSkySettings->setCloudNoiseTextureId(getChild(FIELD_SKY_CLOUD_MAP)->getValue().asUUID()); + LLTextureCtrl* ctrl = getChild(FIELD_SKY_CLOUD_MAP); + mSkySettings->setCloudNoiseTextureId(ctrl->getValue().asUUID()); setIsDirty(); } @@ -391,13 +391,11 @@ BOOL LLPanelSettingsSkySunMoonTab::postBuild() getChild(FIELD_SKY_SUN_IMAGE)->setBlankImageAssetID(LLSettingsSky::GetBlankSunTextureId()); getChild(FIELD_SKY_SUN_IMAGE)->setDefaultImageAssetID(LLSettingsSky::GetBlankSunTextureId()); getChild(FIELD_SKY_SUN_IMAGE)->setAllowNoTexture(TRUE); - getChild(FIELD_SKY_SUN_IMAGE)->setAllowLocalTexture(FALSE); getChild(FIELD_SKY_MOON_ROTATION)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonRotationChanged(); }); getChild(FIELD_SKY_MOON_IMAGE)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonImageChanged(); }); getChild(FIELD_SKY_MOON_IMAGE)->setDefaultImageAssetID(LLSettingsSky::GetDefaultMoonTextureId()); getChild(FIELD_SKY_MOON_IMAGE)->setBlankImageAssetID(LLSettingsSky::GetBlankSunTextureId()); getChild(FIELD_SKY_MOON_IMAGE)->setAllowNoTexture(TRUE); - getChild(FIELD_SKY_MOON_IMAGE)->setAllowLocalTexture(FALSE); getChild(FIELD_SKY_MOON_SCALE)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonScaleChanged(); }); getChild(FIELD_SKY_MOON_BRIGHTNESS)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onMoonBrightnessChanged(); }); -- cgit v1.2.3 From 5c5d7eb1fee8194f02d86e76c1f1eadc161ff462 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Wed, 10 Oct 2018 16:11:44 +0300 Subject: =?UTF-8?q?SL-9850=20Show=20correct=20values=20for=20=E2=80=98Clou?= =?UTF-8?q?d=20Detail=E2=80=99=20settings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/llpaneleditsky.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpaneleditsky.cpp') diff --git a/indra/newview/llpaneleditsky.cpp b/indra/newview/llpaneleditsky.cpp index 1e1683c2e2..082097cdfb 100644 --- a/indra/newview/llpaneleditsky.cpp +++ b/indra/newview/llpaneleditsky.cpp @@ -317,7 +317,7 @@ void LLPanelSettingsSkyCloudTab::refresh() getChild(FIELD_SKY_CLOUD_DENSITY_Y)->setValue(cloudDensity[1]); getChild(FIELD_SKY_CLOUD_DENSITY_D)->setValue(cloudDensity[2]); - LLVector3 cloudDetail(mSkySettings->getCloudPosDensity1().getValue()); + LLVector3 cloudDetail(mSkySettings->getCloudPosDensity2().getValue()); getChild(FIELD_SKY_CLOUD_DETAIL_X)->setValue(cloudDetail[0]); getChild(FIELD_SKY_CLOUD_DETAIL_Y)->setValue(cloudDetail[1]); getChild(FIELD_SKY_CLOUD_DETAIL_D)->setValue(cloudDetail[2]); -- cgit v1.2.3