Add settings/validations for new advanced atmo settings.

6 files changed, 7 insertions, 10 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d277a1158c..9f1b9fb373 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10131,7 +10131,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>1</integer>
+    <integer>0</integer>
   </map>
   <key>RenderUseTriStrips</key>
   <map>
diff --git a/indra/newview/lldrawpoolwlsky.cpp b/indra/newview/lldrawpoolwlsky.cpp
index 042d7d971a..a28041034b 100644
--- a/indra/newview/lldrawpoolwlsky.cpp
+++ b/indra/newview/lldrawpoolwlsky.cpp
@@ -186,7 +186,7 @@ void LLDrawPoolWLSky::renderSkyHaze(F32 camHeightLocal) const
             // bind precomputed textures necessary for calculating sun and sky luminance
             sky_shader->bindTexture(LLShaderMgr::TRANSMITTANCE_TEX, gAtmosphere->getTransmittance());
             sky_shader->bindTexture(LLShaderMgr::SCATTER_TEX, gAtmosphere->getScattering());
-            sky_shader->bindTexture(LLShaderMgr::SINGLE_MIE_SCATTER_TEX, gAtmosphere->getSingleMieScattering());
+            sky_shader->bindTexture(LLShaderMgr::SINGLE_MIE_SCATTER_TEX, gAtmosphere->getMieScattering());
 
             static float sunSize = (float)cos(0.0005);
 
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 6b1c663357..db68b39f75 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -117,6 +117,7 @@ LLSettingsSky::ptr_t LLSettingsVOSky::buildDefaultSky()
     settings[SETTING_NAME] = std::string("_default_");
 
     LLSettingsSky::validation_list_t validations = LLSettingsSky::validationList();
+
     LLSD results = LLSettingsSky::settingValidation(settings, validations);
     if (!results["success"].asBoolean())
     {
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index bec05fa263..6d174442fb 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -3308,7 +3308,7 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
     }
 
 	// this shader uses gather so it can't live with the other basic shaders safely
-	if (success)
+	if (success && (mVertexShaderLevel[SHADER_WINDLIGHT] >= 3))
 	{
 		gDownsampleMinMaxDepthRectProgram.mName = "DownsampleMinMaxDepthRect Shader";
 		gDownsampleMinMaxDepthRectProgram.mShaderFiles.clear();
@@ -3331,8 +3331,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
         success = gInscatterRectProgram.createShader(NULL, NULL);
     }
 
-    llassert(success);
-
 	if (success)
 	{
 		gWLSkyProgram.mName = "Windlight Sky Shader";
@@ -3349,8 +3347,6 @@ BOOL LLViewerShaderMgr::loadShadersWindLight()
 		success = gWLSkyProgram.createShader(NULL, NULL);
 	}
 
-    llassert(success);
-
     if (success && (mVertexShaderLevel[SHADER_WINDLIGHT] < 3))
 	{
 		gWLCloudProgram.mName = "Windlight Cloud Program";
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index cbde0af9b3..e59e86529a 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -98,8 +98,8 @@ const S32 MAX_CACHED_RAW_IMAGE_AREA = 64 * 64;
 const S32 MAX_CACHED_RAW_SCULPT_IMAGE_AREA = LLViewerTexture::sMaxSculptRez * LLViewerTexture::sMaxSculptRez;
 const S32 MAX_CACHED_RAW_TERRAIN_IMAGE_AREA = 128 * 128;
 const S32 DEFAULT_ICON_DIMENTIONS = 32;
-S32 LLViewerTexture::sMinLargeImageSize = 65536; //256 * 256.
-S32 LLViewerTexture::sMaxSmallImageSize = MAX_CACHED_RAW_IMAGE_AREA;
+U32 LLViewerTexture::sMinLargeImageSize = 65536; //256 * 256.
+U32 LLViewerTexture::sMaxSmallImageSize = MAX_CACHED_RAW_IMAGE_AREA;
 BOOL LLViewerTexture::sFreezeImageScalingDown = FALSE;
 F32 LLViewerTexture::sCurrentTime = 0.0f;
 F32  LLViewerTexture::sTexelPixelRatio = 1.0f;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 849273df15..8f691a0453 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -381,7 +381,7 @@ bool	LLPipeline::sRenderBump = true;
 bool	LLPipeline::sBakeSunlight = false;
 bool	LLPipeline::sNoAlpha = false;
 bool	LLPipeline::sUseTriStrips = true;
-bool	LLPipeline::sUseAdvancedAtmospherics = true;
+bool	LLPipeline::sUseAdvancedAtmospherics = false;
 bool	LLPipeline::sUseFarClip = true;
 bool	LLPipeline::sShadowRender = false;
 bool	LLPipeline::sWaterReflections = false;