diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 16bf9a38169e2d672a664d9574632dd10653c074..bbb2a798536bf8b7bed976cc50b88f2cd0c660f0 100644
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -791,8 +791,9 @@ BOOL LLPanelEditWearable::postBuild()
LL_WARNS() << "could not get wearable subpart dictionary entry for subpart: " << subpart_e << LL_ENDL;
continue;
}
-
- const std::string accordion_tab = subpart_entry->mAccordionTab;
+
+ //BD
+ /*const std::string accordion_tab = subpart_entry->mAccordionTab;
LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
@@ -803,7 +804,7 @@ BOOL LLPanelEditWearable::postBuild()
}
// initialize callback to ensure camera view changes appropriately.
- tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));
+ tab->setDropDownStateChangedCallback(boost::bind(&LLPanelEditWearable::onTabExpandedCollapsed,this,_2,index));*/
}
// initialize texture and color picker controls
@@ -1196,10 +1197,12 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
}
const std::string scrolling_panel = subpart_entry->mParamList;
- const std::string accordion_tab = subpart_entry->mAccordionTab;
+ //BD
+ //const std::string accordion_tab = subpart_entry->mAccordionTab;
LLScrollingPanelList *panel_list = getChild<LLScrollingPanelList>(scrolling_panel);
- LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
+ //BD
+ //LLAccordionCtrlTab *tab = getChild<LLAccordionCtrlTab>(accordion_tab);
if (!panel_list)
{
@@ -1207,22 +1210,23 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
continue;
}
- if (!tab)
+ //BD
+ /*if (!tab)
{
LL_WARNS() << "could not get llaccordionctrltab from UI with name: " << accordion_tab << LL_ENDL;
continue;
}
- // Don't show female subparts if you're not female, etc.
- if (!(gAgentAvatarp->getSex() & subpart_entry->mSex))
- {
- tab->setVisible(FALSE);
- continue;
- }
- else
- {
- tab->setVisible(TRUE);
- }
+ // Don't show female subparts if you're not female, etc.
+ if (!(gAgentAvatarp->getSex() & subpart_entry->mSex))
+ {
+ tab->setVisible(FALSE);
+ continue;
+ }
+ else
+ {
+ tab->setVisible(TRUE);
+ }*/
// what edit group do we want to extract params for?
const std::string edit_group = subpart_entry->mEditGroup;
@@ -1237,7 +1241,8 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
jointp = gAgentAvatarp->getJoint("mHead");
}
- buildParamList(panel_list, sorted_params, tab, jointp);
+ //BD
+ buildParamList(panel_list, sorted_params, /*tab,*/ jointp);
updateScrollingPanelUI();
}
@@ -1501,7 +1506,7 @@ void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std:
}
}
-void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp)
+void LLPanelEditWearable::buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, /*LLAccordionCtrlTab *tab,*/ LLJoint* jointp)
{
// sorted_params is sorted according to magnitude of effect from
// least to greatest. Adding to the front of the child list
diff --git a/indra/newview/llpaneleditwearable.h b/indra/newview/llpaneleditwearable.h
index 43d6a3595fdc7eaca0e2f6934cf1b771c35b33fe..cc75ae36cba5c9b9a50450d48ff13438ce48adf7 100644
--- a/indra/newview/llpaneleditwearable.h
+++ b/indra/newview/llpaneleditwearable.h
@@ -85,7 +85,7 @@ class LLPanelEditWearable : public LLPanel
void updateScrollingPanelUI();
LLPanel* getPanel(LLWearableType::EType type);
void getSortedParams(value_map_t &sorted_params, const std::string &edit_group);
- void buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, LLAccordionCtrlTab *tab, LLJoint* jointp);
+ void buildParamList(LLScrollingPanelList *panel_list, value_map_t &sorted_params, /*LLAccordionCtrlTab *tab,*/ LLJoint* jointp);
// update bottom bar buttons ("Save", "Revert", etc)
void updateVerbs();
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 2e622014cf94f2a375237eb74dd89d8ae42f0a44..86cde6a015c4fd067ebc5d3a6ed80d1d64082af2 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -260,7 +260,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
// STEAM-14: When user presses Enter with this field in focus, initiate login
mPasswordEdit->setCommitCallback(boost::bind(&LLPanelLogin::onClickConnect, this));
- mRememberPassCheck = getChild<LLCheckBoxCtrl>("remember_check");
+ mRememberPassCheck = getChild<LLCheckBoxCtrl>("remember_password");
mRememberMeCheck = getChild<LLCheckBoxCtrl>("remember_name");
mRememberMeCheck->setCommitCallback(boost::bind(&LLPanelLogin::onRememberUserCheck, this));
@@ -513,10 +513,9 @@ void LLPanelLogin::populateFields(LLPointer<LLCredential> credential, bool remem
}
else*/
{
- sInstance->getChild<LLUICtrl>("remember_name")->setValue(remember_user);
- LLUICtrl* remember_password = sInstance->getChild<LLUICtrl>("remember_password");
- remember_password->setValue(remember_user && remember_psswrd);
- remember_password->setEnabled(remember_user);
+ sInstance->mRememberMeCheck->setValue(remember_user);
+ sInstance->mRememberPassCheck->setValue(remember_user && remember_psswrd);
+ sInstance->mRememberPassCheck->setEnabled(remember_user);
sInstance->populateUserList(credential);
}
}
@@ -980,22 +979,19 @@ void LLPanelLogin::onRememberUserCheck()
{
if (sInstance)
{
- LLCheckBoxCtrl* remember_name(sInstance->getChild<LLCheckBoxCtrl>("remember_name"));
- LLCheckBoxCtrl* remember_psswrd(sInstance->getChild<LLCheckBoxCtrl>("remember_password"));
- LLComboBox* user_combo(sInstance->getChild<LLComboBox>("username_combo"));
- bool remember = remember_name->getValue().asBoolean();
- if (user_combo->getCurrentIndex() != -1 && !remember)
+ bool remember = sInstance->mRememberMeCheck->getValue().asBoolean();
+ if (sInstance->mUsernameCombo->getCurrentIndex() != -1 && !remember)
{
remember = true;
- remember_name->setValue(true);
+ sInstance->mRememberMeCheck->setValue(true);
LLNotificationsUtil::add("LoginCantRemoveUsername");
}
if (!remember)
{
- remember_psswrd->setValue(false);
+ sInstance->mRememberPassCheck->setValue(false);
}
- remember_psswrd->setEnabled(remember);
+ sInstance->mRememberPassCheck->setEnabled(remember);
}
}
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index ab971c6a8eabd54959ea8fd74df547cf0062ce8f..81ff07a3c758a1bb67c9112b5fb323e600742dea 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -487,7 +487,7 @@ void LLSidepanelAppearance::setWearablesLoading(bool val)
{
getChildView("wearables_loading_indicator")->setVisible( val);
//BD
- if(!getChildView("outfit_edit")->getVisible())
+ if(!getChildView("panel_outfit_edit")->getVisible())
getChildView("edit_outfit_btn")->setVisible( !val);
mCoFLoading = val;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d92d7241ec25e34cc944e20f4bb1693312815e48..8f756ef124f3fabe31fe2706c6da631506e536b4 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -712,6 +712,11 @@ void LLVOVolume::updateTextureVirtualSize(bool forced)
LL_RECORD_BLOCK_TIME(FTM_VOLUME_TEXTURES);
// Update the pixel area of all faces
+ if (mDrawable.isNull())
+ {
+ return;
+ }
+
if(!forced)
{
if(!isVisible())
@@ -2396,7 +2401,8 @@ bool LLVOVolume::notifyAboutCreatingTexture(LLViewerTexture *texture)
//setup new materials
for(map_te_material::const_iterator it = new_material.begin(), end = new_material.end(); it != end; ++it)
{
- LLMaterialMgr::getInstance()->put(getID(), it->first, *it->second);
+ // These are placeholder materials, they shouldn't be sent to server
+ LLMaterialMgr::getInstance()->setLocalMaterial(getRegion()->getRegionID(), it->second);
LLViewerObject::setTEMaterialParams(it->first, it->second);
}
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 4c53aed242705e2c3f0c68ffae2bd8191fc8d3ce..ac4837c9863cbca149896db9efad0e200b9e1f06 100644
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -71,8 +71,7 @@
width="15"
follows="top|right|bottom"
name="scroll_vert"
- orientation="vertical"
- step_size="16"/>
+ orientation="vertical"/>
</layout_panel>
<layout_panel name="timers_panel"
auto_resize="true"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
index 568cbbee09798210bdbe690747e28fb7196f71be..d37f50c150f0a1237204f768d85441206662ed4d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_alpha.xml
@@ -31,7 +31,6 @@
top="0"
width="313" >
<check_box
- control_name="LowerAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -56,7 +55,6 @@
</texture_picker>
<check_box
- control_name="UpperAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -81,7 +79,6 @@
</texture_picker>
<check_box
- control_name="HeadAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -106,7 +103,6 @@
</texture_picker>
<check_box
- control_name="Eye AlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
@@ -131,7 +127,6 @@
</texture_picker>
<check_box
- control_name="HairAlphaTextureInvisible"
follows="left|top"
height="16"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
index 34ef142fd302a0efb7fb9238859cef20ff90c03c..6bbe1c81f194f43b440b57fb1a62dac52aa0f301 100644
--- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml
@@ -138,6 +138,7 @@ width="320">
left="3"
top="0"
mouse_opaque="false"
+ name="outfit_name_and_status"
value="Now editing..."
use_ellipses="true" />
<text
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 9d9698816e1523f8df93ab85d2eb7c4e398e2d8a..92a72b0e658f8a13246ab3666ff4c1d0322f255d 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -312,7 +312,6 @@
follows="left|top"
decimal_digits="0"
increment="1"
- control_name="Edit Cost"
name="Edit Cost"
left_pad="-7"
width="86"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index f1b90a1031a315cc442184c73ef55fb62378f73c..a76d42f87a260dd2c3856faf99bef79f00c544af 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -357,7 +357,6 @@
decimal_digits="0"
increment="1"
left_pad="-7"
- control_name="Edit Cost"
name="Edit Cost"
width="86"
min_val="1"