diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
| commit | f25da4a2c7ad7fc41d15c51524a110e5386d1e5b (patch) | |
| tree | fa874cb1966cefda551fd653180c29f5c3bb974d /indra/newview/llgesturemgr.cpp | |
| parent | 525a56872f1e66651b578e59a776643352a3d523 (diff) | |
| parent | 5e5ad8582cbbe3dd656d9b3824d96a37e312a31a (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llgesturemgr.cpp')
| -rw-r--r-- | indra/newview/llgesturemgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 0996d09e25..6ffd534a53 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -139,6 +139,8 @@ void LLGestureMgr::activateGesture(const LLUUID& item_id) { LLViewerInventoryItem* item = gInventory.getItem(item_id); if (!item) return; + if (item->getType() != LLAssetType::AT_GESTURE) + return; LLUUID asset_id = item->getAssetUUID(); |