Make water and sky defaults take a position value to allow for default daycycle w/ multiple frames.

Make default daycycle add 8 frames at 0, 0.125, 0.25 etc

Merge over server-side bugfixes.

Eliminate extraneous dirty bits in sky settings.

1 files changed, 2 insertions, 0 deletions

diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 7815f4244a..933d5c62ab 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -845,6 +845,7 @@ void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::pt
     updateEditEnvironment();
     LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT);
     synchronizeTabs();
+    updateTabs();
     refresh();
 }
 
@@ -869,6 +870,7 @@ void LLFloaterEditExtDayCycle::loadLiveEnvironment(LLEnvironment::EnvSelection_t
 
     updateEditEnvironment();
     synchronizeTabs();
+    updateTabs();
     refresh();
 }