Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2019-03-02 19:01:49 -05:00
parent 27961f45f0 64931839cc
commit 58ba9e3617
124 changed files with 3136 additions and 3027 deletions
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -351,6 +351,7 @@ void LLViewerTextureList::dump()

 void LLViewerTextureList::destroyGL(BOOL save_state)
 {
+	clearFetchingRequests();
 	LLImageGL::destroyGL(save_state);
 }