livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CID-150 

Checker: NULL_RETURNS
Function: LLFloaterGesture::onCopyPasteAction(const LLSD &)
File: /indra/newview/llfloatergesture.cpp
meow-7.2.2
Tofu Linden 2010-02-11 14:24:38 +00:00
parent 7aa169bd16
commit d56525aaec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llfloatergesture.cpp
View File

@ -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;