diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-27 16:31:07 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-27 16:31:07 -0700 |
| commit | cadc8dc4a3c6f5d7a431e671857d09e0b5eac4a4 (patch) | |
| tree | 1492275a17540d35b88c3eef11447b593f87f6af /indra/newview/llappviewer.cpp | |
| parent | 9423f756e0d0eae72f0f79aa7f1a85b56a282e6f (diff) | |
Fix for gInventory cleanup on shutdown, includes making LLNavigationBar a LLSingleton and explicitly destroying it with the rest of the UI.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 4610437f08..e184d99ffc 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1349,6 +1349,8 @@ bool LLAppViewer::cleanup() if( gViewerWindow) gViewerWindow->shutdownViews(); + // Cleanup Inventory after the UI since it will delete any remaining observers + // (Deleted observers should have already removed themselves) gInventory.cleanupInventory(); // Clean up selection managers after UI is destroyed, as UI may be observing them. |