diff options
author | Brad Linden <brad@lindenlab.com> | 2023-03-29 14:54:06 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2023-03-29 14:54:06 -0700 |
commit | a548c169899734b7d6af1a1870dab1ad1eb74e3c (patch) | |
tree | a347ee3cd54b7bcb317061af9af2abb2a6dad243 /indra/newview/llinventorymodelbackgroundfetch.cpp | |
parent | b130831106d058f0be5414a9a3bcaa99636c7bc0 (diff) | |
parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.cpp')
-rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 406c8b89d0..4a9b471a47 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -363,7 +363,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch() //If there are items in mFetchQueue, we want to check the time since the last bulkFetch was //sent. If it exceeds our retry time, go ahead and fire off another batch. LLViewerRegion * region(gAgent.getRegion()); - if (! region || gDisconnected) + if (! region || gDisconnected || LLApp::isExiting()) { return; } |