Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix inventory move logic

Browse Source
This commit is contained in:
Siana Gearz
2013-05-31 10:54:17 +02:00
parent 1734370682
commit 9b31bd9ad6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llinventorymodel.cpp
View File

@@ -1062,14 +1062,13 @@ void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
return; return;
} }
cat_map_t::iterator it; if((object_id == cat_id) || !is_in_map(mCategoryMap, cat_id))
if((object_id == cat_id) || (it = mCategoryMap.find(cat_id))==mCategoryMap.end())
{ {
llwarns << "Could not move inventory object " << object_id << " to " llwarns << "Could not move inventory object " << object_id << " to "
<< cat_id << llendl; << cat_id << llendl;
return; return;
} }
LLViewerInventoryCategory* cat = it->second; LLViewerInventoryCategory* cat = getCategory(object_id);
if(cat && (cat->getParentUUID() != cat_id)) if(cat && (cat->getParentUUID() != cat_id))
{ {
cat_array_t* cat_array; cat_array_t* cat_array;