summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-05 12:42:12 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-05 12:42:12 +0100
commit476f5e064ea327b1e3426ba2efb5971ced8ba9b0 (patch)
tree961a61ff2a369fa719f6c4a622fdd347165b5320 /indra/newview/llpaneloutfitedit.cpp
parentac787b54682cef5d11ff13fba46024030e7b1edb (diff)
parenteef6ababcdd9ae4c9cbdc5dc295420fa66e753ab (diff)
(hairy) merge from viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r--indra/newview/llpaneloutfitedit.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index 74bb972eb0..0e9b3516ea 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -1322,7 +1322,6 @@ void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
void LLPanelOutfitEdit::onCOFChanged()
{
update();
-}
void LLPanelOutfitEdit::updateWearablesPanelVerbButtons()
{
@@ -1348,7 +1347,10 @@ void LLPanelOutfitEdit::saveListSelection()
if(!selected_ids.size()) return;
- mWearableItemsList->resetSelection();
+ // BAP - this check has to be removed because otherwise item name
+ // changes made when the panel is not visible will not be
+ // propagated to the panel.
+ // if (!isInVisibleChain()) return;
for (std::set<LLUUID>::const_iterator item_id = selected_ids.begin(); item_id != selected_ids.end(); ++item_id)
{