Merge

1 files changed, 1 insertions, 110 deletions

diff --git a/indra/newview/lllegacyatmospherics.h b/indra/newview/lllegacyatmospherics.h
index 95700227f9..cdfcead7a4 100644
--- a/indra/newview/lllegacyatmospherics.h
+++ b/indra/newview/lllegacyatmospherics.h
@@ -206,7 +206,7 @@ public:
     {
     }
 
-    LL_FORCE_INLINE friend bool operator==(const AtmosphericsVars& a, const AtmosphericsVars& b);
+    friend bool operator==(const AtmosphericsVars& a, const AtmosphericsVars& b);
 
     LLColor3  hazeColor;
     LLColor3  hazeColorBelowCloud;
@@ -233,115 +233,6 @@ public:
     LLColor3 total_density;
 };
 
-bool operator==(const AtmosphericsVars& a, const AtmosphericsVars& b)
-{
-    if (a.hazeColor != b.hazeColor)
-    {
-        return false;
-    }
-
-    if (a.hazeColorBelowCloud != b.hazeColorBelowCloud)
-    {
-        return false;
-    }
-
-    if (a.cloudColorSun != b.cloudColorSun)
-    {
-        return false;
-    }
-
-    if (a.cloudColorAmbient != b.cloudColorAmbient)
-    {
-        return false;
-    }
-
-    if (a.cloudDensity != b.cloudDensity)
-    {
-        return false;
-    }
-
-    if (a.density_multiplier != b.density_multiplier)
-    {
-        return false;
-    }
-
-    if (a.haze_horizon != b.haze_horizon)
-    {
-        return false;
-    }
-
-    if (a.haze_density != b.haze_density)
-    {
-        return false;
-    }
-
-    if (a.blue_horizon != b.blue_horizon)
-    {
-        return false;
-    }
-
-    if (a.blue_density != b.blue_density)
-    {
-        return false;
-    }
-
-    if (a.dome_offset != b.dome_offset)
-    {
-        return false;
-    }
-
-    if (a.dome_radius != b.dome_radius)
-    {
-        return false;
-    }
-
-    if (a.cloud_shadow != b.cloud_shadow)
-    {
-        return false;
-    }
-
-    if (a.glow != b.glow)
-    {
-        return false;
-    }
-
-    if (a.ambient != b.ambient)
-    {
-        return false;
-    }
-
-    if (a.sunlight != b.sunlight)
-    {
-        return false;
-    }
-
-    if (a.sun_norm != b.sun_norm)
-    {
-        return false;
-    }
-
-    if (a.gamma != b.gamma)
-    {
-        return false;
-    }
-
-    if (a.max_y != b.max_y)
-    {
-        return false;
-    }
-
-    if (a.distance_multiplier != b.distance_multiplier)
-    {
-        return false;
-    }
-
-    // light_atten, light_transmittance, total_density
-    // are ignored as they always change when the values above do
-    // they're just shared calc across the sky map generation to save cycles
-
-    return true;
-}
-
 class LLAtmospherics
 {
 public: