Merge branch 'main' of https://github.com/secondlife/viewer

# Conflicts:
#	indra/llinventory/llsettingswater.cpp

doc/contributions.txt

@@ -290,6 +290,7 @@ Beq Janus
 	SL-18592
 	SL-18637
 	SL-19317
+	SL-19660
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani

indra/llinventory/llsettingswater.cpp

@@ -286,7 +286,7 @@ F32 LLSettingsWater::getModifiedWaterFogDensity(bool underwater) const
     if (underwater && underwater_fog_mod > 0.0f)
     {        
         underwater_fog_mod = llclamp(underwater_fog_mod, 0.0f, 10.0f);
-        // <FS:Beq> BUG-233797/BUG-233798 -ve underwater fog density can cause (unrecoverable) blackout.
+        // BUG-233797/BUG-233798 -ve underwater fog density can cause (unrecoverable) blackout.
         // raising a negative number to a non-integral power results in a non-real result (which is NaN for our purposes)
         // Two methods were tested, number 2 is being used:
         // 1) Force the fog_mod to be integral. The effect is unlikely to be nice, but it is better than blackness.
@@ -299,7 +299,6 @@ F32 LLSettingsWater::getModifiedWaterFogDensity(bool underwater) const
         {
             fog_density = 1.0f;
         }
-        // </FS:Beq>
         fog_density = pow(fog_density, underwater_fog_mod);
     }
     return fog_density;

indra/newview/VIEWER_VERSION.txt

@@ -1 +1 @@
-6.6.12
+6.6.13