diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2012-01-20 15:48:51 -0700 | 
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2012-01-20 15:48:51 -0700 | 
| commit | 0bf73f73b8167900a2582a494d600fa6e5189b7e (patch) | |
| tree | 74294518dc67f8919d8e4bc3538d9d92345bf080 /indra/newview | |
| parent | 655505d304fb527df61ee8222904940ad6c70db8 (diff) | |
trivial: remove debug code for SH-2828 [crashhunters] Crash in LLRefCount::unref(), bad stacks
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 19 | 
1 files changed, 5 insertions, 14 deletions
| diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 0534246559..5f64dba100 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1960,43 +1960,34 @@ void LLViewerWindow::shutdownViews()  	// clean up warning logger  	LLError::removeRecorder(RecordToChatConsole::getInstance()); -	llinfos << "Warning logger is cleaned." << llendl ; -  	delete mDebugText;  	mDebugText = NULL; -	llinfos << "DebugText deleted." << llendl ; -  	// Cleanup global views  	if (gMorphView)  	{  		gMorphView->setVisible(FALSE);  	} -	llinfos << "Global views cleaned." << llendl ; - +	  	// DEV-40930: Clear sModalStack. Otherwise, any LLModalDialog left open  	// will crump with LL_ERRS.  	LLModalDialog::shutdownModals(); -	llinfos << "LLModalDialog shut down." << llendl;  - +	  	// destroy the nav bar, not currently part of gViewerWindow  	// *TODO: Make LLNavigationBar part of gViewerWindow  	if (LLNavigationBar::instanceExists())  	{  		delete LLNavigationBar::getInstance();  	} -	llinfos << "LLNavigationBar destroyed." << llendl ; - +	  	// destroy menus after instantiating navbar above, as it needs  	// access to gMenuHolder  	cleanup_menus(); -	llinfos << "menus destroyed." << llendl ; - +	  	// Delete all child views.  	delete mRootView;  	mRootView = NULL; -	llinfos << "RootView deleted." << llendl ; - +	  	// Automatically deleted as children of mRootView.  Fix the globals.  	gStatusBar = NULL;  	gIMMgr = NULL; | 
