From 347e88961c06b9febfedeb7dc35f2b12546b5118 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 17 Jun 2010 17:37:28 -0400
Subject: EXT-4919 WIP - populating new users with more gestures, and
 activating appropriate ones

---
 indra/newview/llviewerinventory.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/newview/llviewerinventory.cpp')

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);
 }
-- 
cgit v1.2.3