diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-03 13:59:28 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-03 13:59:28 +0300 |
| commit | 07ca580cfab9b587175743130c0abbeb3bf10637 (patch) | |
| tree | 1e4ea600f72dc8bac96235eaeee06a5ee30e9b92 /indra/newview | |
| parent | b52527de3a74698b90e40217b32324cbd5205d6b (diff) | |
EXT-7503 WIP Made first inventory fetch for Add to Outfit panel on the first openning, updated reliability of LLInventoryFetchItemsObserver
This patch follows (fce2d4f9dc1a). And contains missed by merging changes and fixes Win line endings.
Reviewed by Brad Payne at https://codereview.productengine.com/secondlife/r/456/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfilteredwearablelist.cpp | 14 | ||||
| -rw-r--r-- | indra/newview/llpaneloutfitedit.cpp | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llfilteredwearablelist.cpp b/indra/newview/llfilteredwearablelist.cpp index 0c13bbcab7..306fa5ad6d 100644 --- a/indra/newview/llfilteredwearablelist.cpp +++ b/indra/newview/llfilteredwearablelist.cpp @@ -54,13 +54,13 @@ LLFilteredWearableListManager::~LLFilteredWearableListManager() void LLFilteredWearableListManager::changed(U32 mask) { - if (LLInventoryObserver::CALLING_CARD == mask
- || LLInventoryObserver::GESTURE == mask
- || LLInventoryObserver::SORT == mask
- )
- {
- // skip non-related changes
- return;
+ if (LLInventoryObserver::CALLING_CARD == mask + || LLInventoryObserver::GESTURE == mask + || LLInventoryObserver::SORT == mask + ) + { + // skip non-related changes + return; } if(!gInventory.isInventoryUsable()) diff --git a/indra/newview/llpaneloutfitedit.cpp b/indra/newview/llpaneloutfitedit.cpp index dee9572357..4982e98f8e 100644 --- a/indra/newview/llpaneloutfitedit.cpp +++ b/indra/newview/llpaneloutfitedit.cpp @@ -385,9 +385,10 @@ void LLPanelOutfitEdit::onOpen(const LLSD& key) { if (!mInitialized) { - // *TODO: this method is called even panel is not visible to user because its parent layout panel is hidden.
+ // *TODO: this method is called even panel is not visible to user because its parent layout panel is hidden. // So, we can defer initializing a bit. mWearableListManager = new LLFilteredWearableListManager(mWearableItemsList, mWearableListMaskCollector); + mWearableListManager->populateList(); displayCurrentOutfit(); mInitialized = true; } |