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/llviewerinventory.cpp | |
| parent | 525a56872f1e66651b578e59a776643352a3d523 (diff) | |
| parent | 5e5ad8582cbbe3dd656d9b3824d96a37e312a31a (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 40f15fe86a..3430f265ae 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -922,6 +922,11 @@ void ActivateGestureCallback::fire(const LLUUID& inv_item) { if (inv_item.isNull()) return; + LLViewerInventoryItem* item = gInventory.getItem(inv_item); + if (!item) + return; + if (item->getType() != LLAssetType::AT_GESTURE) + return; LLGestureMgr::instance().activateGesture(inv_item); } |