summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-06-14 17:52:04 -0700
committerRichard Nelson <none@none>2010-06-14 17:52:04 -0700
commitbdbd896cff69e30b34898f831d273f3e3c3109b7 (patch)
treed0778cdaf4ee248395ab7c31a83df346ca2a93bb /indra/newview
parent89f3c3d129d0aa716de9a4784ce999495f5f0a8b (diff)
EXT-7742 WIP "Add to Outfit" type filter should contain items for each wearable type and for each category
added ability to filter inventory folder view by wearable type
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelobjectinventory.cpp6
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