diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 18:13:53 -0700 |
commit | b4275c5d48c8cdf4bbe206822878fcf615897ac9 (patch) | |
tree | 4ef9b931f0a9c8f2b3073c5c33e06672fa56d345 /indra/newview/llappviewer.cpp | |
parent | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (diff) | |
parent | cb1b361b49c9ae6a76eaeeb4476a341a024a71f1 (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b4b30d0cde..4cb3b92476 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1527,7 +1527,6 @@ bool LLAppViewer::cleanup() //Note: //LLViewerMedia::cleanupClass() has to be put before gTextureList.shutdown() //because some new image might be generated during cleaning up media. --bao - LLViewerMediaFocus::cleanupClass(); LLViewerMedia::cleanupClass(); LLViewerParcelMedia::cleanupClass(); gTextureList.shutdown(); // shutdown again in case a callback added something |