diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 16:42:01 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 16:42:01 +0100 |
| commit | 39b7e080cc9c774340bda4e2c31414874d88914f (patch) | |
| tree | 3f3878a57d3c13dd08190e087e294fa441b2a0cc /indra/newview | |
| parent | ced71709c229970188b1bc059a51c8180734e33c (diff) | |
| parent | a781dd767c095470897049b5ae1a91523214b39a (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2d27c89074..0f532236e4 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4143,21 +4143,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 |