diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
| commit | a70d9363dadd23f5304013f87d47e5251d62c575 (patch) | |
| tree | 774508d959bf46265f1d34dae2ab915c695c16bf /indra/newview/llinventorybridge.cpp | |
| parent | b26d3f37bef4e10be2b5f7f4f6408485ed3ccae7 (diff) | |
| parent | 687b4907216339b5ff2b79a5a6c5dfdfb6deeba2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -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 181a9fa7eb..7230a2976a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4151,21 +4151,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 |