diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:39:10 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-02 15:39:10 -0400 |
| commit | 44eaaa507cf96c1e456fe48fd6969c6ace66b919 (patch) | |
| tree | f39536623c5f9fff80ef94bd15d3a6f21ef10403 /indra/newview/llinventorymodel.cpp | |
| parent | 2c1647e84cfb3fd712f665cdc77a772deb80aff9 (diff) | |
| parent | f69ac40e24e78fe265c81ff3785c185229764151 (diff) | |
Merge remote-tracking branch 'release/maint-b' into nat/maint-b-tests
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 205e5f3489..d964b4af21 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2050,8 +2050,8 @@ void LLInventoryModel::deleteObject(const LLUUID& id, bool fix_broken_links, boo { LL_WARNS(LOG_INV) << "Deleting cat " << id << " while it still has child cats" << LL_ENDL; } + mParentChildCategoryTree.erase(id); delete cat_list; - mParentChildCategoryTree.erase(id); } addChangedMask(LLInventoryObserver::REMOVE, id); @@ -5046,4 +5046,3 @@ void LLInventoryModel::FetchItemHttpHandler::processFailure(const char * const r << LLCoreHttpUtil::responseToString(response) << "]" << LL_ENDL; gInventory.notifyObservers(); } - |