From e628d4a534d79fe568c2ffbbc578adf5537bbc58 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 6 Jun 2016 12:12:24 +0200
Subject: [PATCH] Fix some warnings in Windlight-related floaters

---
 indra/newview/llfloatereditsky.cpp   | 31 ++++++++++++++++++++++------
 indra/newview/llfloatereditwater.cpp |  9 +++++++-
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp
index d809211ea7..b329f4097e 100644
--- a/indra/newview/llfloatereditsky.cpp
+++ b/indra/newview/llfloatereditsky.cpp
@@ -101,7 +101,14 @@ void LLFloaterEditSky::onOpen(const LLSD& key)
 	getChild<LLUICtrl>("hint")->setValue(hint);
 
 	// Hide the hint to the right of the combo if we're invoked to create a new preset.
-	getChildView("note")->setVisible(!new_preset);
+	// <FS:Ansariel> FS-modified floater might not have this
+	//getChildView("note")->setVisible(!new_preset);
+	LLView* note = findChildView("note");
+	if (note)
+	{
+		note->setVisible(!new_preset);
+	}
+	// </FS:Ansariel>
 
 	// Switch between the sky presets combobox and preset name input field.
 	mSkyPresetCombo->setVisible(!new_preset);
@@ -703,13 +710,25 @@ void LLFloaterEditSky::refreshSkyPresetsList()
 void LLFloaterEditSky::enableEditing(bool enable)
 {
 	// Enable/disable the tab and their contents.
-	LLTabContainer* tab_container = getChild<LLTabContainer>("WindLight Tabs");
-	tab_container->setEnabled(enable);
-	for (S32 i = 0; i < tab_container->getTabCount(); ++i)
+	// <FS:Ansariel> FS-modified floater might not have this
+	//LLTabContainer* tab_container = getChild<LLTabContainer>("WindLight Tabs");
+	//tab_container->setEnabled(enable);
+	//for (S32 i = 0; i < tab_container->getTabCount(); ++i)
+	//{
+	//	tab_container->enableTabButton(i, enable);
+	//	tab_container->getPanelByIndex(i)->setCtrlsEnabled(enable);
+	//}
+	LLTabContainer* tab_container = findChild<LLTabContainer>("WindLight Tabs");
+	if (tab_container)
 	{
-		tab_container->enableTabButton(i, enable);
-		tab_container->getPanelByIndex(i)->setCtrlsEnabled(enable);
+		tab_container->setEnabled(enable);
+		for (S32 i = 0; i < tab_container->getTabCount(); ++i)
+		{
+			tab_container->enableTabButton(i, enable);
+			tab_container->getPanelByIndex(i)->setCtrlsEnabled(enable);
+		}
 	}
+	// </FS:Ansariel>
 
 	// Enable/disable saving.
 	mSaveButton->setEnabled(enable);
diff --git a/indra/newview/llfloatereditwater.cpp b/indra/newview/llfloatereditwater.cpp
index 43b44eae37..97a42c4c42 100644
--- a/indra/newview/llfloatereditwater.cpp
+++ b/indra/newview/llfloatereditwater.cpp
@@ -535,7 +535,14 @@ void LLFloaterEditWater::refreshWaterPresetsList()
 void LLFloaterEditWater::enableEditing(bool enable)
 {
 	// Enable/disable water controls.
-	getChild<LLPanel>("panel_water_preset")->setCtrlsEnabled(enable);
+	// <FS:Ansariel> FS-modified floater might have this
+	//getChild<LLPanel>("panel_water_preset")->setCtrlsEnabled(enable);
+	LLPanel* panel_water_preset = findChild<LLPanel>("panel_water_preset");
+	if (panel_water_preset)
+	{
+		panel_water_preset->setCtrlsEnabled(enable);
+	}
+	// </FS:Ansariel>
 
 	// Enable/disable saving.
 	mSaveButton->setEnabled(enable);