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

OpenSim crash fixes, thx to Henri and Zauber

Browse Source
This commit is contained in:
Siana Gearz
2011-03-15 15:19:37 +01:00
parent 0eab7bd2a5
commit 7b98e5f2f1
10 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llinventoryview.cpp
View File

@@ -1812,12 +1812,19 @@ void LLInventoryPanel::modelChanged(U32 mask)
}
LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolders->getItemByID(model_item->getParentUUID());
if (new_parent)
{
if (view_item->getParentFolder() != new_parent)
{
view_item->getParentFolder()->extractItem(view_item);
view_item->addToFolder(new_parent, mFolders);
}
}
else
{
llwarns << model_item->getParentUUID() << ": parent folder gone !" << llendl;
}
}
}
else
{
@@ -1832,7 +1839,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
}
else
{
llwarns << *id_it << "Item does not exist in either view or model, but notification triggered" << llendl;
llwarns << *id_it << ": Item does not exist in either view or model, but notification triggered" << llendl;
}
}
}