diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-22 08:55:49 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-22 08:55:49 -0700 |
| commit | f2bda4b2d75501815fddffac9b84ce0336bedab1 (patch) | |
| tree | dd3f93d06ba1105dae4fc910f4ae8601a792d4b1 /indra/newview/llviewerinventory.cpp | |
| parent | 7f73d1414b113089d3be244a978d5f4af6d9afc3 (diff) | |
| parent | a42cf03807385c214118298821d532f5b6b4d984 (diff) | |
Merged from viewer-release
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); } |