summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelinventory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-02 16:14:53 +0000
commit210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch)
tree7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/newview/llsidepanelinventory.cpp
parent9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff)
parent0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff)
PE merge.
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rw-r--r--indra/newview/llsidepanelinventory.cpp16
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()