summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelinventory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-03 16:08:44 +0000
commita171848fd4fed2fe915bcb42de96359112cf95e1 (patch)
tree5f4d85f4469f2d737864b3a07b367fa81040f3a3 /indra/newview/llsidepanelinventory.cpp
parentcc5920bed7790db49a062fb98ce54191f06ed98c (diff)
parentfc70ca5403acdd99b2235dbf4e513a4dd806c850 (diff)
merge from viewer2.
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..3fd5309947 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("open");
+ break;
+ }
}
void LLSidepanelInventory::onTeleportButtonClicked()