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

Fixed normal bug EXT-1859 (Only just added landmark is shown in "favorites bar" folder) 

Reason: items of Inventory Panel's start folder are removed while processing Inventory model changed event.
  In this case root items have no parent LLFolderViewFolder and parent is LLFolderView (LLInventoryPanel::mFolders) itself.
Fix:
 - added check of LLFolderViewItem's parent against NULL.

--HG--
branch : product-engine
meow-7.2.2
Mike Antipov (Mike ProductEngine) 2009-10-27 16:34:33 +02:00
parent bfc9445563
commit a2de480807
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloaterinventory.cpp
View File

@ -1438,7 +1438,11 @@ void LLInventoryPanel::modelChanged(U32 mask)
}
LLFolderViewFolder* new_parent = (LLFolderViewFolder*)mFolders->getItemByID(model_item->getParentUUID());
if (view_item->getParentFolder() != new_parent)
// added check against NULL for cases when Inventory panel contains startFolder.
// in this case parent is LLFolderView (LLInventoryPanel::mFolders) itself.
// this check is a fix for bug EXT-1859.
if (NULL != new_parent && view_item->getParentFolder() != new_parent)
{
view_item->getParentFolder()->extractItem(view_item);
view_item->addToFolder(new_parent, mFolders);