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

Fixed some warnings in the build floater: 

* LLView::getChild: Making dummy class LLView named "select_single" in Object
* LLView::getChild: Making dummy class LLView named "label color" in Features
meow-7.2.2
Ansariel 2013-04-28 17:13:53 +02:00
parent 9547622d05
commit 3d87178cfc
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
indra/newview/llpanelobject.cpp
View File

@ -593,18 +593,20 @@ void LLPanelObject::getState( )
BOOL editable = root_objectp->permModify();
// Select Single Message
getChildView("select_single")->setVisible( FALSE);
getChildView("edit_object")->setVisible( FALSE);
if (!editable || single_volume || selected_count <= 1)
{
getChildView("edit_object")->setVisible( TRUE);
getChildView("edit_object")->setEnabled(TRUE);
}
else
{
getChildView("select_single")->setVisible( TRUE);
getChildView("select_single")->setEnabled(TRUE);
}
// <FS:Ansariel> We don't have those in FS (2013-04-28)
//getChildView("select_single")->setVisible( FALSE);
//getChildView("edit_object")->setVisible( FALSE);
//if (!editable || single_volume || selected_count <= 1)
//{
// getChildView("edit_object")->setVisible( TRUE);
// getChildView("edit_object")->setEnabled(TRUE);
//}
//else
//{
// getChildView("select_single")->setVisible( TRUE);
// getChildView("select_single")->setEnabled(TRUE);
//}
// </FS:Ansariel>
BOOL is_flexible = volobjp && volobjp->isFlexible();
BOOL is_permanent = root_objectp->flagObjectPermanent();
@ -2258,9 +2260,11 @@ void LLPanelObject::clearCtrls()
mLabelRadiusOffset->setEnabled( FALSE );
mLabelRevolutions->setEnabled( FALSE );
getChildView("select_single")->setVisible( FALSE);
getChildView("edit_object")->setVisible( TRUE);
getChildView("edit_object")->setEnabled(FALSE);
// <FS:Ansariel> We don't have those in Firestorm (2013-04-28)
//getChildView("select_single")->setVisible( FALSE);
//getChildView("edit_object")->setVisible( TRUE);
//getChildView("edit_object")->setEnabled(FALSE);
// </FS:Ansariel>
getChildView("scale_hole")->setEnabled(FALSE);
getChildView("scale_taper")->setEnabled(FALSE);

14
indra/newview/llpanelvolume.cpp
View File

@ -282,7 +282,9 @@ void LLPanelVolume::getState( )
if (is_light && editable && single_volume)
{
getChildView("label color")->setEnabled(true);
// <FS:Ansariel> We don't have that one in Firestorm (2013-04-28)
//getChildView("label color")->setEnabled(true);
// </FS:Ansariel>
//mLabelColor ->setEnabled( TRUE );
LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch)
@ -325,7 +327,9 @@ void LLPanelVolume::getState( )
getChild<LLSpinCtrl>("Light Radius", true)->clear();
getChild<LLSpinCtrl>("Light Falloff", true)->clear();
getChildView("label color")->setEnabled(false);
// <FS:Ansariel> We don't have that one in Firestorm (2013-04-28)
//getChildView("label color")->setEnabled(false);
// </FS:Ansariel>
LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch)
{
@ -568,8 +572,10 @@ void LLPanelVolume::clearCtrls()
getChildView("edit_object")->setEnabled(false);
getChildView("edit_object")->setVisible(false);
getChildView("Light Checkbox Ctrl")->setEnabled(false);
getChildView("label color")->setEnabled(false);
getChildView("label color")->setEnabled(false);
// <FS:Ansariel> We don't have that one in Firestorm (2013-04-28)
//getChildView("label color")->setEnabled(false);
//getChildView("label color")->setEnabled(false);
// </FS:Ansariel>
LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch)
{