diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:18:10 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 17:18:10 +0000 |
| commit | 797823f600621c4c22b5a3c20bad3e48c1f3be1a (patch) | |
| tree | e79a450b0b777b19cf7ffabd5fa5fefdf4000e96 /indra/newview/llinventorybridge.cpp | |
| parent | 1307c384ad1d039de19007237f2670fc757ef2ad (diff) | |
CID-422
Checker: NULL_RETURNS
Function: LLGestureBridge::performAction(LLFolderView *, LLInventoryModel *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>)
File: /indra/newview/llinventorybridge.cpp
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 035b2a12ee..0b0e3be675 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3816,7 +3816,12 @@ void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* mode BOOL inform_server = TRUE; BOOL deactivate_similar = FALSE; LLGestureManager::instance().setGestureLoadedCallback(mUUID, boost::bind(&LLGestureBridge::playGesture, mUUID)); - LLGestureManager::instance().activateGestureWithAsset(mUUID, gInventory.getItem(mUUID)->getAssetUUID(), inform_server, deactivate_similar); + LLViewerInventoryItem* item = gInventory.getItem(mUUID); + llassert(item); + if (item) + { + LLGestureManager::instance().activateGestureWithAsset(mUUID, item->getAssetUUID(), inform_server, deactivate_similar); + } } else { |