diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:24:38 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:24:38 +0000 |
| commit | d56525aaec271775d7fa4ffb162b1316850161e5 (patch) | |
| tree | cafebba3a73a68ada4308660ca74f601705a5443 /indra/newview | |
| parent | 7aa169bd1663c35b7a299091172c6fc7cc527966 (diff) | |
CID-150
Checker: NULL_RETURNS
Function: LLFloaterGesture::onCopyPasteAction(const LLSD &)
File: /indra/newview/llfloatergesture.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatergesture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index b684e1f985..60a5fb6aba 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -510,6 +510,7 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command) if(ids.empty() || !gInventory.isCategoryComplete(mGestureFolderID)) return; LLInventoryCategory* gesture_dir = gInventory.getCategory(mGestureFolderID); + llassert(gesture_dir); LLPointer<GestureCopiedCallback> cb = new GestureCopiedCallback(this); for(LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++) @@ -517,7 +518,7 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command) LLInventoryItem* item = gInventory.getItem(*it); LLStringUtil::format_map_t string_args; string_args["[COPY_NAME]"] = item->getName(); - if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE) + if(gesture_dir && item && item->getInventoryType() == LLInventoryType::IT_GESTURE) { LL_DEBUGS("Gesture")<< "Copying gesture " << item->getName() << " "<< item->getUUID() << " into " << gesture_dir->getName() << " "<< gesture_dir->getUUID() << LL_ENDL; |