summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-12 10:12:52 -0700
committerRichard Linden <none@none>2010-08-12 10:12:52 -0700
commit41fe9750c82605ccfbaf8f9b0f08b9068de702d3 (patch)
treed0e6bbffa926edff4d70d87bbf030bf28cd6953a /indra/newview/llpaneloutfitedit.cpp
parent73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff)
parent73952a37ed7a11331154f2f68050286722ec96da (diff)
Automated merge with http://10.1.4.28:8000/
Diffstat (limited to 'indra/newview/llpaneloutfitedit.cpp')
-rw-r--r--indra/newview/llpaneloutfitedit.cpp15
1 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp
index c7ac4af14c..0464aa377e 100644
--- a/indra/newview/llpaneloutfitedit.cpp
+++ b/indra/newview/llpaneloutfitedit.cpp
@@ -773,11 +773,11 @@ void LLPanelOutfitEdit::onAddWearableClicked(void)
}
}
-void LLPanelOutfitEdit::onReplaceBodyPartMenuItemClicked(LLUUID selected_item_id)
+void LLPanelOutfitEdit::onReplaceMenuItemClicked(LLUUID selected_item_id)
{
LLViewerInventoryItem* item = gInventory.getLinkedItem(selected_item_id);
- if (item && item->getType() == LLAssetType::AT_BODYPART)
+ if (item)
{
showFilteredWearablesListView(item->getWearableType());
}
@@ -1032,7 +1032,7 @@ void LLPanelOutfitEdit::filterWearablesBySelectedItem(void)
applyListViewFilter(LVIT_BODYPART);
break;
case LLAssetType::AT_CLOTHING:
- default:
+ default:
applyListViewFilter(LVIT_CLOTHING);
break;
}
@@ -1321,6 +1321,13 @@ void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
void LLPanelOutfitEdit::onCOFChanged()
{
+ //the panel is only updated when is visible to a user
+
+ // 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;
+
update();
}
@@ -1348,8 +1355,6 @@ void LLPanelOutfitEdit::saveListSelection()
if(!selected_ids.size()) return;
- mWearableItemsList->resetSelection();
-
for (std::set<LLUUID>::const_iterator item_id = selected_ids.begin(); item_id != selected_ids.end(); ++item_id)
{
mWearableItemsList->selectItemByUUID(*item_id, true);