Merge tag '7.1.8-release'

source for viewer 7.1.8.9375512768

2 files changed, 12 insertions, 37 deletions

diff --git a/indra/llinventory/llsettingssky.cpp b/indra/llinventory/llsettingssky.cpp
index bc60f3724a..902a66b0b2 100644
--- a/indra/llinventory/llsettingssky.cpp
+++ b/indra/llinventory/llsettingssky.cpp
@@ -408,7 +408,6 @@ LLSettingsSky::LLSettingsSky(const LLSD &data) :
     mNextRainbowTextureId(),
     mNextHaloTextureId()
 {
-    mCanAutoAdjust = !data.has(SETTING_REFLECTION_PROBE_AMBIANCE);
 }
 
 LLSettingsSky::LLSettingsSky():
@@ -431,8 +430,6 @@ void LLSettingsSky::replaceSettings(LLSD settings)
     mNextBloomTextureId.setNull();
     mNextRainbowTextureId.setNull();
     mNextHaloTextureId.setNull();
-
-    mCanAutoAdjust = !settings.has(SETTING_REFLECTION_PROBE_AMBIANCE);
 }
 
 void LLSettingsSky::replaceWithSky(LLSettingsSky::ptr_t pother)
@@ -445,7 +442,6 @@ void LLSettingsSky::replaceWithSky(LLSettingsSky::ptr_t pother)
     mNextBloomTextureId = pother->mNextBloomTextureId;
     mNextRainbowTextureId = pother->mNextRainbowTextureId;
     mNextHaloTextureId = pother->mNextHaloTextureId;
-    mCanAutoAdjust = pother->mCanAutoAdjust;
 }
 
 void LLSettingsSky::blend(const LLSettingsBase::ptr_t &end, F64 blendf)
@@ -1147,7 +1143,6 @@ void LLSettingsSky::setSkyIceLevel(F32 ice_level)
 
 void LLSettingsSky::setReflectionProbeAmbiance(F32 ambiance)
 {
-    mCanAutoAdjust = false; // we've now touched this sky in a "new" way, it can no longer auto adjust
     setValue(SETTING_REFLECTION_PROBE_AMBIANCE, ambiance);
 }
 
@@ -1449,24 +1444,6 @@ F32 LLSettingsSky::getReflectionProbeAmbiance(bool auto_adjust) const
     return mSettings[SETTING_REFLECTION_PROBE_AMBIANCE].asReal();
 }
 
-F32 LLSettingsSky::getTotalReflectionProbeAmbiance(F32 cloud_shadow_scale, bool auto_adjust) const
-{
-#if 0
-    // feed cloud shadow back into reflection probe ambiance to mimic pre-reflection-probe behavior
-    // without brightening dark/interior spaces
-    F32 probe_ambiance = getReflectionProbeAmbiance(auto_adjust);
-
-    if (probe_ambiance > 0.f && probe_ambiance < 1.f)
-    {
-        probe_ambiance += (1.f - probe_ambiance) * getCloudShadow() * cloud_shadow_scale;
-    }
-
-    return probe_ambiance;
-#else
-    return getReflectionProbeAmbiance(auto_adjust);
-#endif
-}
-
 F32 LLSettingsSky::getSkyBottomRadius() const
 {
     return mSettings[SETTING_SKY_BOTTOM_RADIUS].asReal();
@@ -1811,3 +1788,8 @@ LLUUID LLSettingsSky::getNextBloomTextureId() const
     return mNextBloomTextureId;
 }
 
+// if true, this sky is a candidate for auto-adjustment
+bool LLSettingsSky::canAutoAdjust() const
+{
+    return !mSettings.has(SETTING_REFLECTION_PROBE_AMBIANCE);
+}
diff --git a/indra/llinventory/llsettingssky.h b/indra/llinventory/llsettingssky.h
index 8aade96484..222ab040cb 100644
--- a/indra/llinventory/llsettingssky.h
+++ b/indra/llinventory/llsettingssky.h
@@ -62,7 +62,7 @@ public:
     static const std::string SETTING_DOME_OFFSET;
     static const std::string SETTING_DOME_RADIUS;
     static const std::string SETTING_GAMMA;
-    static const std::string SETTING_GLOW;
+    static const std::string SETTING_GLOW;    
     static const std::string SETTING_LIGHT_NORMAL;
     static const std::string SETTING_MAX_Y;
     static const std::string SETTING_MOON_ROTATION;
@@ -92,7 +92,7 @@ public:
         static const std::string SETTING_DENSITY_PROFILE_EXP_SCALE_FACTOR;
         static const std::string SETTING_DENSITY_PROFILE_LINEAR_TERM;
         static const std::string SETTING_DENSITY_PROFILE_CONSTANT_TERM;
-
+        
     static const std::string SETTING_SKY_MOISTURE_LEVEL;
     static const std::string SETTING_SKY_DROPLET_RADIUS;
     static const std::string SETTING_SKY_ICE_LEVEL;
@@ -117,7 +117,7 @@ public:
     virtual std::string getSettingsType() const SETTINGS_OVERRIDE { return std::string("sky"); }
     virtual LLSettingsType::type_e getSettingsTypeValue() const SETTINGS_OVERRIDE { return LLSettingsType::ST_SKY; }
 
-    // Settings status
+    // Settings status 
     virtual void blend(const LLSettingsBase::ptr_t &end, F64 blendf) SETTINGS_OVERRIDE;
 
     virtual void replaceSettings(LLSD settings) SETTINGS_OVERRIDE;
@@ -129,7 +129,7 @@ public:
     F32 getSkyBottomRadius() const;
     F32 getSkyTopRadius() const;
     F32 getSunArcRadians() const;
-    F32 getMieAnisotropy() const;
+    F32 getMieAnisotropy() const;   
 
     F32 getSkyMoistureLevel() const;
     F32 getSkyDropletRadius() const;
@@ -139,10 +139,6 @@ public:
     // auto_adjust - if true and canAutoAdjust() is true, return 1.0
     F32 getReflectionProbeAmbiance(bool auto_adjust = false) const;
 
-    // get the probe ambiance setting to use for rendering (adjusted by cloud shadow, aka cloud coverage)
-    // auto_adjust - if true and canAutoAdjust() is true, return 1.0
-    F32 getTotalReflectionProbeAmbiance(F32 cloud_shadow_scale, bool auto_adjust = false) const;
-
     // Return first (only) profile layer represented in LLSD
     LLSD getRayleighConfig() const;
     LLSD getMieConfig() const;
@@ -200,7 +196,7 @@ public:
 
     F32 getCloudShadow() const;
     void setCloudShadow(F32 val);
-
+    
     F32 getCloudVariance() const;
     void setCloudVariance(F32 val);
 
@@ -299,7 +295,7 @@ public:
 
     // color based on brightness
     LLColor3  getMoonlightColor() const;
-
+    
     LLColor4  getMoonAmbient() const;
     LLColor3  getMoonDiffuse() const;
     LLColor4  getSunAmbient() const;
@@ -340,7 +336,7 @@ public:
     virtual void        updateSettings() SETTINGS_OVERRIDE;
 
     // if true, this sky is a candidate for auto-adjustment
-    bool canAutoAdjust() const { return mCanAutoAdjust; }
+    bool canAutoAdjust() const;
 
 protected:
     static const std::string SETTING_LEGACY_EAST_ANGLE;
@@ -385,9 +381,6 @@ private:
     mutable LLColor4    mTotalAmbient;
     mutable LLColor4    mHazeColor;
 
-    // if true, this sky is a candidate for auto adjustment
-    bool mCanAutoAdjust = true;
-
     typedef std::map<std::string, S32> mapNameToUniformId_t;
 
     static mapNameToUniformId_t sNameToUniformMapping;