diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 950ffd8b72..13f835d9ed 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1475,7 +1475,10 @@ void LLFloaterTools::getMediaState()
&&first_object->permModify()
))
{
- getChildView("Add_Media")->setEnabled(FALSE);
+ // Doesn't exist as of 2016-11-16
+ //getChildView("Add_Media")->setEnabled(FALSE);
+ getChildView("add_media")->setEnabled(FALSE);
+ //
media_info->clear();
clearMediaSettings();
return;
@@ -1486,7 +1489,10 @@ void LLFloaterTools::getMediaState()
if(!has_media_capability)
{
- getChildView("Add_Media")->setEnabled(FALSE);
+ // Doesn't exist as of 2016-11-16
+ //getChildView("Add_Media")->setEnabled(FALSE);
+ getChildView("add_media")->setEnabled(FALSE);
+ //
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); // Doesn't exist as of 2016-11-16
// IF all the faces have media (or all dont have media)
if ( LLFloaterMediaSettings::getInstance()->mIdenticalHasMediaInfo )
{
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e021ad4ecf..d0e916a482 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1507,8 +1507,10 @@ void LLPanelFace::updateUI()
mColorSwatch->setValid(FALSE);
}
getChildView("color trans")->setEnabled(FALSE);
- getChildView("rpt")->setEnabled(FALSE);
- getChildView("tex offset")->setEnabled(FALSE);
+ // Doesn't exist as of 2016-11-16
+ //getChildView("rpt")->setEnabled(FALSE);
+ //getChildView("tex offset")->setEnabled(FALSE);
+ //
getChildView("tex gen")->setEnabled(FALSE);
getChildView("label shininess")->setEnabled(FALSE);
getChildView("label bumpiness")->setEnabled(FALSE);
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index 49b96fb10d..51ef422f6c 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -127,7 +127,7 @@ void LLPanelLandInfo::refresh()
getChildView("label_area")->setVisible(false);
//mTextPrice->setText(LLStringUtil::null);
- getChild("textbox price")->setValue(LLStringUtil::null);
+ //getChild("textbox price")->setValue(LLStringUtil::null); // Doesn't exist as of 2016-11-16
getChildView("button buy land")->setEnabled(FALSE);
getChildView("button abandon land")->setEnabled(FALSE);
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 27f926b54a..20f80f50e2 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -251,7 +251,7 @@ void LLPanelPermissions::disableAll()
getChild("Object Description")->setValue(LLStringUtil::null);
getChildView("Object Description")->setEnabled(FALSE);
- getChildView("Permissions:")->setEnabled(FALSE);
+ //getChildView("Permissions:")->setEnabled(FALSE); // Doesn't exist as of 2016-11-16 (gone since 2009)
getChild("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("Cost")->setValue(getString("Cost Default"));
+ // Doesn't exist as of 2016-11-16 (gone since 2009)
+ //getChildView("Cost")->setEnabled(FALSE);
+ //getChild("Cost")->setValue(getString("Cost Default"));
+ //
getChild("Edit Cost")->setValue(LLStringUtil::null);
getChildView("Edit Cost")->setEnabled(FALSE);
@@ -414,7 +416,7 @@ void LLPanelPermissions::refresh()
getChildView("pathfinding_attributes_value")->setEnabled(TRUE);
getChild("pathfinding_attributes_value")->setValue(LLTrans::getString(pfAttrName));
- getChildView("Permissions:")->setEnabled(TRUE);
+ //getChildView("Permissions:")->setEnabled(TRUE); // 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); // Doesn't exist as of 2016-11-16 (gone since 2009)
getChild("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("Cost")->setValue(getString("Cost Per Unit"));
- }
- else
- {
- getChild("Cost")->setValue(getString("Cost Default"));
- }
+ // Doesn't exist as of 2016-11-16 (gone since 2009)
+ //if (num_for_sale > 1)
+ //{
+ // getChild("Cost")->setValue(getString("Cost Per Unit"));
+ //}
+ //else
+ //{
+ // getChild("Cost")->setValue(getString("Cost Default"));
+ //}
+ //
// 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); // 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); // 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("Edit Cost")->setValue(LLStringUtil::null);
// If multiple items are for sale, set text to TOTAL PRICE.
- if (num_for_sale > 1)
- getChild("Cost")->setValue(getString("Cost Total"));
- else
- getChild("Cost")->setValue(getString("Cost Default"));
+ // Doesn't exist as of 2016-11-16 (gone since 2009)
+ //if (num_for_sale > 1)
+ // getChild("Cost")->setValue(getString("Cost Total"));
+ //else
+ // getChild("Cost")->setValue(getString("Cost Default"));
+ //
}
// This is a public object.
else
{
- getChildView("Cost")->setEnabled(FALSE);
- getChild("Cost")->setValue(getString("Cost Default"));
+ // Doesn't exist as of 2016-11-16 (gone since 2009)
+ //getChildView("Cost")->setEnabled(FALSE);
+ //getChild("Cost")->setValue(getString("Cost Default"));
+ //
getChild("Edit Cost")->setValue(LLStringUtil::null);
getChildView("Edit Cost")->setEnabled(FALSE);
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index e8dbbefb42..db826d3255 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -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); // Doesn't exist as of 2016-11-16
getChildView("Light FOV")->setVisible( visible);
getChildView("Light Focus")->setVisible( visible);
getChildView("Light Ambiance")->setVisible( visible);
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 90cae5e2e8..70fcc2c1b2 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -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" />