diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-03 00:15:44 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-03 00:15:44 +0300 |
commit | 2be5baf70dcf4e55fcac3935e304828ced202123 (patch) | |
tree | a5e621e99d764af9528c1fbfbbfa6b584bb4498b /indra/newview/llinventorybridge.cpp | |
parent | 820ac72f8c4a07bc4310b9daac6966f2f2f2ee98 (diff) |
SL-13182 Fix excessive resorting #2
Don't resort whole branch of inventory if created(loaded) item is not newer. Should also stabilize fetch phase a bit.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 15c3f10436..923a06b324 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1905,7 +1905,8 @@ void LLItemBridge::buildDisplayName() const LLStringUtil::toUpper(mSearchableName); //Name set, so trigger a sort - if(mParent) + LLInventorySort sorter = static_cast<LLFolderViewModelInventory&>(mRootViewModel).getSorter(); + if(mParent && !sorter.isByDate()) { mParent->requestSort(); } @@ -2204,7 +2205,8 @@ void LLFolderBridge::buildDisplayName() const LLStringUtil::toUpper(mSearchableName); //Name set, so trigger a sort - if(mParent) + LLInventorySort sorter = static_cast<LLFolderViewModelInventory&>(mRootViewModel).getSorter(); + if(mParent && sorter.isFoldersByName()) { mParent->requestSort(); } |