livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some warnings in Windlight-related floaters

master
Ansariel 2016-06-06 12:12:24 +02:00
parent 67b2092cc2
commit e628d4a534
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llfloatereditsky.cpp
View File

@ -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);

9
indra/newview/llfloatereditwater.cpp
View File

@ -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);