summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-10-26 23:41:18 -0700
committerSteve Bennetts <steve@lindenlab.com>2009-10-26 23:41:18 -0700
commitc0abbb6a648778f2acfaabd4e70763c0e31f7790 (patch)
treee88aa904d5f89cbc4933636858033ed05c4743a4 /indra/newview/llappviewer.cpp
parent4272cc6956b21f77326b0c6bbbbc4be37e7f6fad (diff)
Fixed a crash on exit in gInventory destructor.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 923a66ee8e..840fa542bd 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1350,7 +1350,9 @@ bool LLAppViewer::cleanup()
// Destroy the UI
if( gViewerWindow)
gViewerWindow->shutdownViews();
-
+
+ gInventory.cleanupInventory();
+
// Clean up selection managers after UI is destroyed, as UI may be observing them.
// Clean up before GL is shut down because we might be holding on to objects with texture references
LLSelectMgr::cleanupGlobals();