From d2feb07b2e304cf5cd6e917533809f98c062bc38 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 8 Feb 2014 13:13:31 +0100
Subject: [PATCH] Fix warning "LLView::getChild: Making dummy class
 LLCheckBoxCtrl named "UseLightShaders2" in Preferences"; that checkbox only
 exists in LL's simple graphics settings

---
 indra/newview/llfloaterpreference.cpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index a14407ddb5..b7e9cc5c00 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1618,7 +1618,7 @@ void LLFloaterPreference::refreshEnabledState()
 
 	//Deferred/SSAO/Shadows
 	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
-	LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
+	//LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2"); <FS:Ansariel> We don't have that
 
 	
 	BOOL enabled = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") &&
@@ -1629,7 +1629,7 @@ void LLFloaterPreference::refreshEnabledState()
 						(ctrl_wind_light->get()) ? TRUE : FALSE;
 
 	ctrl_deferred->setEnabled(enabled);
-	ctrl_deferred2->setEnabled(enabled);
+	//ctrl_deferred2->setEnabled(enabled); <FS:Ansariel> We don't have that
 
 	// <FS:Ansariel> Tofu's SSR
 	getChild<LLCheckBoxCtrl>("FSRenderSSR")->setEnabled(enabled && (ctrl_deferred->get() ? TRUE : FALSE) && gSavedSettings.getS32("RenderShadowDetail") > 0);
@@ -1666,7 +1666,7 @@ void LLFloaterPreference::disableUnavailableSettings()
 	LLCheckBoxCtrl* ctrl_wind_light    = getChild<LLCheckBoxCtrl>("WindLightUseAtmosShaders");
 	LLCheckBoxCtrl* ctrl_avatar_impostors = getChild<LLCheckBoxCtrl>("AvatarImpostors");
 	LLCheckBoxCtrl* ctrl_deferred = getChild<LLCheckBoxCtrl>("UseLightShaders");
-	LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2");
+	//LLCheckBoxCtrl* ctrl_deferred2 = getChild<LLCheckBoxCtrl>("UseLightShaders2"); <FS:Ansariel> We don't have that
 	LLComboBox* ctrl_shadows = getChild<LLComboBox>("ShadowDetail");
 	LLCheckBoxCtrl* ctrl_ssao = getChild<LLCheckBoxCtrl>("UseSSAO");
 	LLCheckBoxCtrl* ctrl_dof = getChild<LLCheckBoxCtrl>("UseDoF");
@@ -1702,8 +1702,9 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
+		// <FS:Ansariel> We don't have that
+		//ctrl_deferred2->setEnabled(FALSE);
+		//ctrl_deferred2->setValue(FALSE);
 
 		// <FS:Ansariel> Tofu's SSR
 		ctrl_ssr->setEnabled(FALSE);
@@ -1728,8 +1729,9 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
+		// <FS:Ansariel> We don't have that
+		//ctrl_deferred2->setEnabled(FALSE);
+		//ctrl_deferred2->setValue(FALSE);
 
 		// <FS:Ansariel> Tofu's SSR
 		ctrl_ssr->setEnabled(FALSE);
@@ -1751,8 +1753,9 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
+		// <FS:Ansariel> We don't have that
+		//ctrl_deferred2->setEnabled(FALSE);
+		//ctrl_deferred2->setValue(FALSE);
 
 		// <FS:Ansariel> Tofu's SSR
 		ctrl_ssr->setEnabled(FALSE);
@@ -1805,8 +1808,9 @@ void LLFloaterPreference::disableUnavailableSettings()
 
 		ctrl_deferred->setEnabled(FALSE);
 		ctrl_deferred->setValue(FALSE);
-		ctrl_deferred2->setEnabled(FALSE);
-		ctrl_deferred2->setValue(FALSE);
+		// <FS:Ansariel> We don't have that
+		//ctrl_deferred2->setEnabled(FALSE);
+		//ctrl_deferred2->setValue(FALSE);
 
 		// <FS:Ansariel> Tofu's SSR
 		ctrl_ssr->setEnabled(FALSE);