From 564a8433404ea97e5424fc12089958a2d753747f Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 25 May 2010 13:27:17 +0100 Subject: VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables Pulled this from the AvP backlog and implemented it, as it's a pain point from Ben's usability findings. And people loooove this in 3rd party viewers. --- indra/newview/llinventorybridge.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index ea43670da0..10cc6fae32 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3400,7 +3400,7 @@ openSoundPreview((void*)this); //send_uuid_sound_trigger(item->getAssetUUID(), 1.0); } */ - } +} void LLSoundBridge::previewItem() { @@ -4187,21 +4187,9 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) void LLObjectBridge::openItem() { - LLViewerInventoryItem* item = getItem(); - - if (item) - { - LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel()); - } - - LLSD key; - key["id"] = mUUID; - LLSideTray::getInstance()->showPanel("sidepanel_inventory", key); - - // Disable old properties floater; this is replaced by the sidepanel. - /* - LLFloaterReg::showInstance("properties", mUUID); - */ + // object double-click action is to wear/unwear object + performAction(getInventoryModel(), + get_is_item_worn(mUUID) ? "detach" : "attach"); } LLFontGL::StyleFlags LLObjectBridge::getLabelStyle() const -- cgit v1.2.3