aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorelektrahesse2010-10-12 10:55:10 +0200
committerelektrahesse2010-10-12 10:55:10 +0200
commit7fcde632c2201fd20c8a58512a487d4e650275ae (patch)
treeba30dd6b92a911a7676465251512618f0c735297 /linden/indra
parentRED-626: Added linden/indra/newview/mozilla-universal-darwin.tgz to .gitignore (diff)
downloadmeta-impy-7fcde632c2201fd20c8a58512a487d4e650275ae.zip
meta-impy-7fcde632c2201fd20c8a58512a487d4e650275ae.tar.gz
meta-impy-7fcde632c2201fd20c8a58512a487d4e650275ae.tar.bz2
meta-impy-7fcde632c2201fd20c8a58512a487d4e650275ae.tar.xz
RED-526: No more saving of screen_last.bmp on the root of the hard drive if not logged in.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llappviewer.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4806dda..e6882f1 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2790,7 +2790,10 @@ void LLAppViewer::forceQuit()
2790 2790
2791 LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL; 2791 LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL;
2792 if (mQuitRequested) 2792 if (mQuitRequested)
2793 LLApp::setQuitting(); 2793 {
2794 llwarns << "Force Quitting" << llendl;
2795 LLApp::setQuitting();
2796 }
2794 else 2797 else
2795 { 2798 {
2796 if (mLogoutRequested) //we just finished a logout request 2799 if (mLogoutRequested) //we just finished a logout request
@@ -3750,15 +3753,6 @@ void LLAppViewer::idleShutdown()
3750 forceQuit(); 3753 forceQuit();
3751 } 3754 }
3752 3755
3753
3754 static bool saved_snapshot = false;
3755 if (!saved_snapshot)
3756 {
3757 saved_snapshot = true;
3758 saveFinalSnapshot();
3759 return;
3760 }
3761
3762 // Attempt to close all floaters that might be 3756 // Attempt to close all floaters that might be
3763 // editing things. 3757 // editing things.
3764 if (gFloaterView) 3758 if (gFloaterView)