From affb75666cc84610eedd1e8b81b0e75b1e260dc9 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 19 Jul 2018 19:23:04 +0300 Subject: MAINT-8906 EEP - Disable sky layer tabs when not supported --- indra/newview/llfloatereditextdaycycle.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 468c3599ff..c6e2418b46 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -254,6 +254,11 @@ void LLFloaterEditExtDayCycle::onOpen(const LLSD& key) getChild(track_tabs[idx + 1], true)->setTextArg("[DSC]", label.str()); } + bool extended_env = LLEnvironment::instance().isExtendedEnvironmentEnabled(); + for (int i = 2; i < LLSettingsDay::TRACK_MAX; i++) //skies #2 through #4 + { + getChild(track_tabs[i])->setEnabled(extended_env); + } } void LLFloaterEditExtDayCycle::onClose(bool app_quitting) @@ -887,7 +892,14 @@ void LLFloaterEditExtDayCycle::updateEditEnvironment(void) mSkyBlender = std::make_shared(mScratchSky, mEditDay, skytrack); mWaterBlender = std::make_shared(mScratchWater, mEditDay, LLSettingsDay::TRACK_WATER); - selectTrack(LLSettingsDay::TRACK_MAX, true); + if (LLEnvironment::instance().isExtendedEnvironmentEnabled()) + { + selectTrack(LLSettingsDay::TRACK_MAX, true); + } + else + { + selectTrack(1, true); + } reblendSettings(); -- cgit v1.2.3