diff options
| author | Richard Nelson <none@none> | 2010-06-14 17:52:56 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-14 17:52:56 -0700 |
| commit | 330b9dc6eef3ea015c8ae3e41fe061bcea4e1c51 (patch) | |
| tree | d4c2d2108e79685f3624d9622387d3fce4bbfd18 /indra/newview | |
| parent | 339b9d3ee67da07eb6c9147f7e39dbad88181cf2 (diff) | |
| parent | bdbd896cff69e30b34898f831d273f3e3c3109b7 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index ad3a5c2380..1d726ba06c 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, @@ -177,13 +179,13 @@ void LLTaskInvFVBridge::showProperties() show_item_profile(mUUID); // Disable old properties floater; this is replaced by the sidepanel. - /* + LLFloaterProperties* floater = LLFloaterReg::showTypedInstance<LLFloaterProperties>("properties", mUUID); if (floater) { floater->setObjectID(mPanel->getTaskUUID()); } - */ + } struct LLBuyInvItemData |