diff options
| author | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2021-02-03 09:31:32 -0800 |
| commit | d26567915cd80999260edffc41df467a7cbbd80c (patch) | |
| tree | 84072d2a7a5e6afa7b57850ed4b325439cb2be16 /indra/newview/llwearableitemslist.h | |
| parent | 7528855442a100cee379b9e409280a69caa78bba (diff) | |
| parent | 21565a1f3fe1ae737e2f91c58be2c3cb0b5a2fec (diff) | |
Merge with Master after Viewer release
Diffstat (limited to 'indra/newview/llwearableitemslist.h')
| -rw-r--r-- | indra/newview/llwearableitemslist.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h index f3182ed163..ba8488b237 100644 --- a/indra/newview/llwearableitemslist.h +++ b/indra/newview/llwearableitemslist.h @@ -415,6 +415,8 @@ public: public: /*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y); + void show(LLView* spawning_view, LLWearableType::EType w_type, S32 x, S32 y); + protected: enum { MASK_CLOTHING = 0x01, @@ -431,6 +433,7 @@ public: static void setMenuItemEnabled(LLContextMenu* menu, const std::string& name, bool val); static void updateMask(U32& mask, LLAssetType::EType at); static void createNewWearable(const LLUUID& item_id); + static void createNewWearableByType(LLWearableType::EType type); LLWearableItemsList* mParent; }; @@ -469,6 +472,8 @@ public: void setSortOrder(ESortOrder sort_order, bool sort_now = true); + void setMenuWearableType(LLWearableType::EType type) { mMenuWearableType = type; } + protected: friend class LLUICtrlFactory; LLWearableItemsList(const LLWearableItemsList::Params& p); @@ -479,6 +484,8 @@ protected: bool mWornIndicationEnabled; ESortOrder mSortOrder; + + LLWearableType::EType mMenuWearableType; }; #endif //LL_LLWEARABLEITEMSLIST_H |