Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer

indra/newview/llpaneleditsky.cpp

@@ -216,7 +216,7 @@ void LLPanelSettingsSkyAtmosTab::refresh()
     getChild<LLUICtrl>(FIELD_SKY_DENSITY_ICE_LEVEL)->setValue(ice_level);
     getChild<LLUICtrl>(FIELD_REFLECTION_PROBE_AMBIANCE)->setValue(rp_ambiance);
 
-    updateGammaLabel();
+    updateGammaLabel(should_auto_adjust);
 }
 
 //-------------------------------------------------------------------------
@@ -334,10 +334,10 @@ void LLPanelSettingsSkyAtmosTab::onReflectionProbeAmbianceChanged()
 }
 
 
-void LLPanelSettingsSkyAtmosTab::updateGammaLabel()
+void LLPanelSettingsSkyAtmosTab::updateGammaLabel(bool auto_adjust)
 {
     if (!mSkySettings) return;
-    F32 ambiance = mSkySettings->getReflectionProbeAmbiance();
+    F32 ambiance = mSkySettings->getReflectionProbeAmbiance(auto_adjust);
     if (ambiance != 0.f)
     {
         childSetValue("scene_gamma_label", getString("hdr_string"));

indra/newview/llpaneleditsky.h

@@ -80,7 +80,7 @@ class LLPanelSettingsSkyAtmosTab : public LLPanelSettingsSky
     void                    onDropletRadiusChanged();
     void                    onIceLevelChanged();
     void                    onReflectionProbeAmbianceChanged();
-    void                    updateGammaLabel();
+    void                    updateGammaLabel(bool auto_adjust = false);
 
 };
 

indra/newview/llvocache.cpp

@@ -1195,6 +1195,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
 
 	readCacheHeader();	
 
+	LL_INFOS() << "Viewer Object Cache Versions - expected: " << cache_version << " found: " << mMetaInfo.mVersion <<  LL_ENDL;
+
 	if( mMetaInfo.mVersion != cache_version
 		|| mMetaInfo.mAddressSize != expected_address) 
 	{
@@ -1205,7 +1207,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
 			clearCacheInMemory();
 		}
 		else //delete the current cache if the format does not match.
-		{			
+		{
+			LL_INFOS() << "Viewer Object Cache Versions unmatched.  clearing cache." <<  LL_ENDL;
 			removeCache();
 		}
 	}