From b785b9d219dd6458550304945ed806cf5a153a2a Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 05:15:47 -0500
Subject: [PATCH] Added 'Transparent Water' checkbox to graphics panel, as we
 actually have space for it now.

---
 indra/newview/llpaneldisplay.cpp                           | 7 +++++++
 indra/newview/llpaneldisplay.h                             | 2 ++
 .../default/xui/en-us/panel_preferences_graphics1.xml      | 5 +++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index aaf304236..680160a82 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -224,6 +224,9 @@ BOOL LLPanelDisplay::postBuild()
 
 	mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
 
+	// Enable Transparent Water
+	mCtrlTransparentWater = getChild<LLCheckBoxCtrl>("TransparentWater");
+
 	//----------------------------------------------------------------------------
 	// Enable Bump/Shiny
 	mCtrlBumpShiny = getChild<LLCheckBoxCtrl>("BumpShiny");
@@ -409,6 +412,7 @@ void LLPanelDisplay::refresh()
 	mQualityPerformance = gSavedSettings.getU32("RenderQualityPerformance");
 	mCustomSettings = gSavedSettings.getBOOL("RenderCustomSettings");
 
+	mTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
 	// shader settings
 	mBumpShiny = gSavedSettings.getBOOL("RenderObjectBump");
 	mShaderEnable = gSavedSettings.getBOOL("VertexShaderEnable");
@@ -666,6 +670,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	llassert(mSkyFactorText != NULL);
 	llassert(mPostProcessText != NULL);
 
+	llassert(mCtrlTransparentWater != NULL);
 	llassert(mCtrlBumpShiny != NULL);
 	llassert(mCtrlWindLight != NULL);
 	llassert(mCtrlAvatarVP != NULL);
@@ -716,6 +721,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	mSkyFactorText->setVisible(!isHidden);
 	mPostProcessText->setVisible(!isHidden);
 
+	mCtrlTransparentWater->setVisible(!isHidden);
 	mCtrlBumpShiny->setVisible(!isHidden);
 	mCtrlWindLight->setVisible(!isHidden);
 	mCtrlAvatarVP->setVisible(!isHidden);
@@ -761,6 +767,7 @@ void LLPanelDisplay::cancel()
 
 	gSavedSettings.setBOOL("RenderCustomSettings", mCustomSettings);
 
+	gSavedSettings.setBOOL("RenderTransparentWater", mTransparentWater);
 	gSavedSettings.setBOOL("RenderObjectBump", mBumpShiny);
 	gSavedSettings.setBOOL("VertexShaderEnable", mShaderEnable);
 	gSavedSettings.setBOOL("WindLightUseAtmosShaders", mWindLight);
diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h
index 9b601d7d1..6cf3df465 100644
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -108,6 +108,7 @@ protected:
 	LLSliderCtrl	*mCtrlPostProcess;				// Max Particle
 	LLSliderCtrl	*mCtrlNonImpostors;				// Max non-impostors
 
+	LLCheckBoxCtrl	*mCtrlTransparentWater;
 	LLCheckBoxCtrl	*mCtrlBumpShiny;
 	LLCheckBoxCtrl	*mCtrlWindLight;
 	LLCheckBoxCtrl	*mCtrlAvatarVP;
@@ -153,6 +154,7 @@ protected:
 	S32 mQualityPerformance;
 	BOOL mCustomSettings;
 
+	BOOL mTransparentWater;
 	BOOL mBumpShiny;
 	BOOL mShaderEnable;
 	BOOL mWindLight;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4be19eadc..9c1608092 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -39,14 +39,15 @@
 	<check_box bottom="-96" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
 	<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
 	<text bottom="-130" height="12" left="10" name="ShadersText">Shaders:</text>
-	<check_box bottom_delta="-23" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
+  <check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
+	<check_box bottom_delta="-17" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
     <check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
 	<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
 	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" initial_value="true" label="Atmospheric shaders" left_delta="0" name="WindLightUseAtmosShaders"/>
 	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
     <check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
 	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
-  <text bottom_delta="-60" height="12" left="15" name="ShadowDetailText">Shadows:</text>
+  <text bottom_delta="-43" height="12" left="15" name="ShadowDetailText">Shadows:</text>
   <combo_box bottom_delta="-22" control_name="RenderShadowDetail" label="Shadow Detail" left_delta="-2" name="ShadowDetailCombo" width="160" height="16">
 	  <combo_item name="0" value="0">Disabled</combo_item>
 	  <combo_item name="1" value="1">Sun/Moon</combo_item>