diff options
| author | Leslie Linden <none@none> | 2011-06-08 15:48:44 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-08 15:48:44 -0700 |
| commit | 6e928645b94901518fe452ab7fab0278e87613d7 (patch) | |
| tree | f94413d61460d6d54501c5f7ce2ed92eb4571587 /indra/newview | |
| parent | de78d17e912b7e2a4c563a7a428f11cce33644c0 (diff) | |
| parent | 86470d3889436017264a69d57fb2060a591955f4 (diff) | |
Merge to fix 64k limit on param blocks
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 4ecb645337..e97f0fcc2e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1979,7 +1979,10 @@ void LLViewerWindow::shutdownViews() // destroy the nav bar, not currently part of gViewerWindow // *TODO: Make LLNavigationBar part of gViewerWindow - delete LLNavigationBar::getInstance(); + if (LLNavigationBar::instanceExists()) + { + delete LLNavigationBar::getInstance(); + } // destroy menus after instantiating navbar above, as it needs // access to gMenuHolder |