summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2022-09-02 00:00:58 -0700
committerPtolemy <ptolemy@lindenlab.com>2022-09-02 00:00:58 -0700
commit44f1aed84cda3158c19573205ce25d69d632b29a (patch)
tree310497e0a116f6c5d39212d1f30535c512909144 /indra/newview/llappviewer.cpp
parentd9d33c15973550efdb428a165aacd3ccdd7cc14f (diff)
parente15982eb55c03e53f669eb91715cf2aa7d32998c (diff)
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 6ca35684d9..54f189625e 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2071,6 +2071,7 @@ bool LLAppViewer::cleanup()
if (sTextureFetch)
{
sTextureFetch->shutdown();
+ sTextureFetch->waitOnPending();
delete sTextureFetch;
sTextureFetch = NULL;
}