Merge

3 files changed, 9 insertions, 6 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();
 }
 
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index deaaffb1f5..44bb9fc6f5 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -525,10 +525,11 @@ void LLSettingsVOSky::updateSettings()
 	F32 sun_dynamic_range = llmax(gSavedSettings.getF32("RenderSunDynamicRange"), 0.0001f);
     mSceneLightStrength = 2.0f * (1.0f + sun_dynamic_range * dp);
 
-    // Axis swaps convert from +x right, +z up, +y at
-    // to CFR +x at, +z up, +y right coord sys
-    LLVector3 sun_direction_cfr(sun_direction.mV[0],   -sun_direction.mV[1],  sun_direction.mV[2]);
-    LLVector3 moon_direction_cfr(moon_direction.mV[0], -moon_direction.mV[1], moon_direction.mV[2]);
+    // Axis swaps convert from "normal" (+x right, +z up, +y at)
+    // to CFR (+x at, +z up, +y right) coord sys
+    LLVector3 sun_direction_cfr(sun_direction.mV[1],   sun_direction.mV[0],  sun_direction.mV[2]);
+    LLVector3 moon_direction_cfr(moon_direction.mV[1], moon_direction.mV[0], moon_direction.mV[2]);
+
     gSky.setSunAndMoonDirectionsCFR(sun_direction_cfr, moon_direction_cfr);
     gSky.setSunTextures(getSunTextureId(), getNextSunTextureId());
     gSky.setMoonTextures(getMoonTextureId(), getNextMoonTextureId());
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index 7c1fda46ff..4c84e40c73 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -389,7 +389,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 	mSun.setIntensity(SUN_INTENSITY);
 	mMoon.setIntensity(0.1f * SUN_INTENSITY);
 
-	mBloomTexturep = LLViewerTextureManager::getFetchedTexture(IMG_BLOOM1);
+	mBloomTexturep = LLViewerTextureManager::getFetchedTexture(LLSettingsSky::GetDefaultBloomTextureId());
 	mBloomTexturep->setNoDelete() ;
 	mBloomTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
 
@@ -488,7 +488,7 @@ void LLVOSky::restoreGL()
         setMoonTextures(psky->getMoonTextureId(), psky->getNextMoonTextureId());
     }
 
-	mBloomTexturep = LLViewerTextureManager::getFetchedTexture(IMG_BLOOM1);
+	mBloomTexturep = LLViewerTextureManager::getFetchedTexture(LLSettingsSky::GetDefaultBloomTextureId());
 	mBloomTexturep->setNoDelete() ;
 	mBloomTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);