diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 15:19:32 -0700 |
| commit | 7d87e55c547a537526ee121dc68df6513d513f05 (patch) | |
| tree | 3a62fbf7d145ca686945f89119ace8089d3d59b1 /indra/newview/llfloaterinventory.cpp | |
| parent | 59407cdb9c40d96cf0c4fb13ee5f3a59934ef655 (diff) | |
| parent | 07c04df983123d5fcf1c45f3900e66e1fd8542bc (diff) | |
Merge PE revisions 3765-3786 from https://hg.aws.productengine.com/secondlife/viewer-2-0/
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
| -rw-r--r-- | indra/newview/llfloaterinventory.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp index c890f9f122..a47916b7d7 100644 --- a/indra/newview/llfloaterinventory.cpp +++ b/indra/newview/llfloaterinventory.cpp @@ -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); |