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

Fixed a bunch of XUI warnings

master
Ansariel 2016-11-16 14:55:15 +01:00
parent 3d37a8edd4
commit ad30fce29d
6 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloatertools.cpp
View File

@ -1475,7 +1475,10 @@ void LLFloaterTools::getMediaState()
&&first_object->permModify()
))
{
getChildView("Add_Media")->setEnabled(FALSE);
// <FS:Ansariel> Doesn't exist as of 2016-11-16
//getChildView("Add_Media")->setEnabled(FALSE);
getChildView("add_media")->setEnabled(FALSE);
// </FS:Ansariel>
media_info->clear();
clearMediaSettings();
return;
@ -1486,7 +1489,10 @@ void LLFloaterTools::getMediaState()
if(!has_media_capability)
{
getChildView("Add_Media")->setEnabled(FALSE);
// <FS:Ansariel> Doesn't exist as of 2016-11-16
//getChildView("Add_Media")->setEnabled(FALSE);
getChildView("add_media")->setEnabled(FALSE);
// </FS:Ansariel>
LL_WARNS("LLFloaterTools: media") << "Media not enabled (no capability) in this region!" << LL_ENDL;
clearMediaSettings();
return;
@ -1582,7 +1588,7 @@ void LLFloaterTools::getMediaState()
// update UI depending on whether "object" (prim or face) has media
// and whether or not you are allowed to edit it.
getChildView("Add_Media")->setEnabled(editable);
//getChildView("Add_Media")->setEnabled(editable); // <FS:Ansariel> Doesn't exist as of 2016-11-16
// IF all the faces have media (or all dont have media)
if ( LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo )
{

6
indra/newview/llpanelface.cpp
View File

@ -1507,8 +1507,10 @@ void LLPanelFace::updateUI()
mColorSwatch->setValid(FALSE);
}
getChildView("color trans")->setEnabled(FALSE);
getChildView("rpt")->setEnabled(FALSE);
getChildView("tex offset")->setEnabled(FALSE);
// <FS:Ansariel> Doesn't exist as of 2016-11-16
//getChildView("rpt")->setEnabled(FALSE);
//getChildView("tex offset")->setEnabled(FALSE);
// </FS:Ansariel>
getChildView("tex gen")->setEnabled(FALSE);
getChildView("label shininess")->setEnabled(FALSE);
getChildView("label bumpiness")->setEnabled(FALSE);

2
indra/newview/llpanelland.cpp
View File

@ -127,7 +127,7 @@ void LLPanelLandInfo::refresh()
getChildView("label_area")->setVisible(false);
//mTextPrice->setText(LLStringUtil::null);
getChild<LLUICtrl>("textbox price")->setValue(LLStringUtil::null);
//getChild<LLUICtrl>("textbox price")->setValue(LLStringUtil::null); // <FS:Ansariel> Doesn't exist as of 2016-11-16
getChildView("button buy land")->setEnabled(FALSE);
getChildView("button abandon land")->setEnabled(FALSE);

50
indra/newview/llpanelpermissions.cpp
View File

@ -251,7 +251,7 @@ void LLPanelPermissions::disableAll()
getChild<LLUICtrl>("Object Description")->setValue(LLStringUtil::null);
getChildView("Object Description")->setEnabled(FALSE);
getChildView("Permissions:")->setEnabled(FALSE);
//getChildView("Permissions:")->setEnabled(FALSE); // <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
getChild<LLUICtrl>("checkbox share with group")->setValue(FALSE);
getChildView("checkbox share with group")->setEnabled(FALSE);
@ -288,8 +288,10 @@ void LLPanelPermissions::disableAll()
combo_sale_type->setValue(LLSaleInfo::FS_COPY);
combo_sale_type->setEnabled(FALSE);
getChildView("Cost")->setEnabled(FALSE);
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
//getChildView("Cost")->setEnabled(FALSE);
//getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// </FS:Ansariel>
getChild<LLUICtrl>("Edit Cost")->setValue(LLStringUtil::null);
getChildView("Edit Cost")->setEnabled(FALSE);
@ -414,7 +416,7 @@ void LLPanelPermissions::refresh()
getChildView("pathfinding_attributes_value")->setEnabled(TRUE);
getChild<LLUICtrl>("pathfinding_attributes_value")->setValue(LLTrans::getString(pfAttrName));
getChildView("Permissions:")->setEnabled(TRUE);
//getChildView("Permissions:")->setEnabled(TRUE); // <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
// Update creator text field
getChildView("Creator:")->setEnabled(TRUE);
@ -606,7 +608,7 @@ void LLPanelPermissions::refresh()
if (!owners_identical)
{
getChildView("Cost")->setEnabled(FALSE);
//getChildView("Cost")->setEnabled(FALSE); // <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
getChild<LLUICtrl>("Edit Cost")->setValue(LLStringUtil::null);
getChildView("Edit Cost")->setEnabled(FALSE);
}
@ -614,19 +616,21 @@ void LLPanelPermissions::refresh()
else if (self_owned || (group_owned && gAgent.hasPowerInGroup(group_id,GP_OBJECT_SET_SALE)))
{
// If there are multiple items for sale then set text to PRICE PER UNIT.
if (num_for_sale > 1)
{
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Per Unit"));
}
else
{
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
}
// <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
//if (num_for_sale > 1)
//{
// getChild<LLUICtrl>("Cost")->setValue(getString("Cost Per Unit"));
//}
//else
//{
// getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
//}
// </FS:Ansariel>
// The edit fields are only enabled if you can sell this object
// and the sale price is not mixed.
//BOOL enable_edit = (num_for_sale && can_transfer) ? !is_for_sale_mixed : FALSE;
BOOL enable_edit = can_transfer ? !is_for_sale_mixed : FALSE;
getChildView("Cost")->setEnabled(enable_edit);
//getChildView("Cost")->setEnabled(enable_edit); // <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
// Dont update and clear the price if change is pending
if (update_sale_info)
@ -655,7 +659,7 @@ void LLPanelPermissions::refresh()
// Someone, not you, owns these objects.
else if (!public_owned)
{
getChildView("Cost")->setEnabled(FALSE);
//getChildView("Cost")->setEnabled(FALSE); // <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
getChildView("Edit Cost")->setEnabled(FALSE);
// Don't show a price if none of the items are for sale.
@ -665,16 +669,20 @@ void LLPanelPermissions::refresh()
getChild<LLUICtrl>("Edit Cost")->setValue(LLStringUtil::null);
// If multiple items are for sale, set text to TOTAL PRICE.
if (num_for_sale > 1)
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Total"));
else
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
//if (num_for_sale > 1)
// getChild<LLUICtrl>("Cost")->setValue(getString("Cost Total"));
//else
// getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// </FS:Ansariel>
}
// This is a public object.
else
{
getChildView("Cost")->setEnabled(FALSE);
getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// <FS:Ansariel> Doesn't exist as of 2016-11-16 (gone since 2009)
//getChildView("Cost")->setEnabled(FALSE);
//getChild<LLUICtrl>("Cost")->setValue(getString("Cost Default"));
// </FS:Ansariel>
getChild<LLUICtrl>("Edit Cost")->setValue(LLStringUtil::null);
getChildView("Edit Cost")->setEnabled(FALSE);

2
indra/newview/llpanelvolume.cpp
View File

@ -530,7 +530,7 @@ void LLPanelVolume::refresh()
BOOL visible = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_DEFERRED) > 0 ? TRUE : FALSE;
getChildView("label texture")->setVisible( visible);
//getChildView("label texture")->setVisible( visible); // <FS:Ansariel> Doesn't exist as of 2016-11-16
getChildView("Light FOV")->setVisible( visible);
getChildView("Light Focus")->setVisible( visible);
getChildView("Light Ambiance")->setVisible( visible);

2
indra/newview/skins/default/xui/en/floater_report_abuse.xml
View File

@ -324,7 +324,7 @@
height="23"
layout="topleft"
left="10"
max_length="256"
max_length_bytes="256"
name="abuse_location_edit"
top_pad="0"
width="313" />