diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-15 14:57:16 +0100 |
| commit | 0b523e402720493cd19a2fa08f8cffceea01eadf (patch) | |
| tree | dc5137535761f87729932ed1de2ec33273b43b32 /indra/newview/llinventorybridge.h | |
| parent | d5ddb91a6809540cdb407cd48eff32b2c595d5db (diff) | |
| parent | fce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index d97dfd535e..757808eb93 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -123,6 +123,7 @@ public: EDragAndDropType cargo_type, void* cargo_data) { return FALSE; } virtual LLInventoryType::EType getInventoryType() const { return mInvType; } + virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; } //-------------------------------------------------------------------- // Convenience functions for adding various common menu options. @@ -471,6 +472,7 @@ public: virtual void buildContextMenu(LLMenuGL& menu, U32 flags); virtual std::string getLabelSuffix() const; virtual BOOL renameItem(const std::string& new_name); + virtual LLWearableType::EType getWearableType() const { return mWearableType; } static void onWearOnAvatar( void* userdata ); // Access to wearOnAvatar() from menu static BOOL canWearOnAvatar( void* userdata ); |