diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llsidepanelinventory.cpp | |
parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
parent | e3344abb95802646912f357d214538966f3f2357 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index 5383158cd3..7b923f4b0b 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -164,7 +164,21 @@ void LLSidepanelInventory::onWearButtonClicked() void LLSidepanelInventory::onPlayButtonClicked() { - performActionOnSelection("activate"); + const LLInventoryItem *item = getSelectedItem(); + if (!item) + { + return; + } + + switch(item->getInventoryType()) + { + case LLInventoryType::IT_GESTURE: + performActionOnSelection("play"); + break; + default: + performActionOnSelection("activate"); + break; + } } void LLSidepanelInventory::onTeleportButtonClicked() |