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/llpanelobjectinventory.cpp | |
| parent | d5ddb91a6809540cdb407cd48eff32b2c595d5db (diff) | |
| parent | fce2653f6b5e8ca3509d13e3449b1fdd2f5ff826 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index ad3a5c2380..da809b7baa 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -135,6 +135,8 @@ public: virtual BOOL isUpToDate() const { return TRUE; } virtual BOOL hasChildren() const { return FALSE; } virtual LLInventoryType::EType getInventoryType() const { return LLInventoryType::IT_NONE; } + virtual LLWearableType::EType getWearableType() const { return LLWearableType::WT_NONE; } + // LLDragAndDropBridge functionality virtual BOOL startDrag(EDragAndDropType* type, LLUUID* id) const; virtual BOOL dragOrDrop(MASK mask, BOOL drop, @@ -184,6 +186,7 @@ void LLTaskInvFVBridge::showProperties() floater->setObjectID(mPanel->getTaskUUID()); } */ + } struct LLBuyInvItemData |