diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:22 -0600 |
| commit | 55ee008035cd41ac2c8c2b95bd251adcb3699c5a (patch) | |
| tree | 3c39277e429b8742c7cff815e6aea4e75e942490 /indra/newview/llinventorymodel.cpp | |
| parent | 93b1da52f56293663d9bfe5272a83a77185f4cff (diff) | |
| parent | dc1dd7a274e1ce49eb68ca525eba7f2e39032fa8 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index e5c9ec927a..75dda5557d 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1694,11 +1694,11 @@ void LLInventoryModel::deleteObject(const LLUUID& id, bool fix_broken_links, boo // Can't have links to links, so there's no need for this update // if the item removed is a link. Can also skip if source of the // update is getting broken link info separately. - obj = NULL; // delete obj if (fix_broken_links && !is_link_type) { updateLinkedObjectsFromPurge(id); } + obj = nullptr; // delete obj if (do_notify_observers) { notifyObservers(); @@ -2718,7 +2718,6 @@ void LLInventoryModel::buildParentChildMap() // some accounts has pbroken inventory root folders std::string name = "My Inventory"; - LLUUID prev_root_id = mRootFolderID; for (parent_cat_map_t::const_iterator it = mParentChildCategoryTree.begin(), it_end = mParentChildCategoryTree.end(); it != it_end; ++it) { |