summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.h
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-08-02 20:52:17 +0300
committerSergei Litovchuk <slitovchuk@productengine.com>2010-08-02 20:52:17 +0300
commit74ed51e77d7a44b845dcc12d1d7ad6a426caaa2d (patch)
treee30c6541f88013fe4fb822dca028b9bf1df7485b /indra/newview/llpaneloutfitedit.h
parentb8b7a61e9e732b16a56ae0bec3b9098ccfd28292 (diff)
EXT-7676 FIXED Restored fix (47df1b3fd94e) reverted in merge 5b5cc4a8642d with slight modifications.
- Replaced pointers passed to 'Add More' gear menu with LLHandle. - Removed storing 'Add More' panel sort order from settings because the order is changed each time the panel opens. - Replaced creating items comparator in LLPanelOutfitEdit::postBuild() with a static comparator in llwearableitemslist.cpp. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/826/. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
-rw-r--r--indra/newview/llpaneloutfitedit.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index b3394e45a3..0b6926b83e 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -43,8 +43,8 @@
#include "llremoteparcelrequest.h"
#include "llinventory.h"
#include "llinventoryfunctions.h"
-#include "llinventoryitemslist.h"
#include "llinventorymodel.h"
+#include "llwearableitemslist.h"
class LLButton;
class LLCOFWearables;
@@ -230,9 +230,8 @@ private:
LLComboBox* mListViewFilterCmbBox;
LLFilteredWearableListManager* mWearableListManager;
- LLInventoryItemsList* mWearableItemsList;
+ LLWearableItemsList* mWearableItemsList;
LLPanel* mWearablesListViewPanel;
- LLWearableItemTypeNameComparator* mWearableListViewItemsComparator;
LLCOFDragAndDropObserver* mCOFDragAndDropObserver;
@@ -241,6 +240,7 @@ private:
LLCOFWearables* mCOFWearables;
LLMenuGL* mGearMenu;
+ LLMenuGL* mAddWearablesGearMenu;
bool mInitialized;
std::auto_ptr<LLSaveOutfitComboBtn> mSaveComboBtn;