LindenUserDir fixes.

The LindenUserDir (~/.imprudence/first_last/) cannot be initialized
before the user logged in. However, several singletons (that only can be
initialized once) depend on this directory for initialization. Therefore
we have to take care not to instantiate those singletons until after the
user logged in.

With regard to webit, this fixes the browser_profile (cache and cookies)
directory that the builtin browser uses.

1 files changed, 13 insertions, 7 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 9fad9f1..1d45575 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1205,7 +1205,10 @@ bool LLAppViewer::cleanup()
 
         //reset balance for not playing the UI-Sound 
         //when relogging into another account 
-        gStatusBar->clearBalance();
+        if (gStatusBar)
+        {
+                gStatusBar->clearBalance();
+        }
 
         if (mQuitRequested)
         {
@@ -3282,12 +3285,15 @@ void LLAppViewer::saveFinalSnapshot()
                 gSavedSettings.setBOOL("ShowParcelOwners", FALSE);
                 idle();
 
-                std::string snap_filename = gDirUtilp->getLindenUserDir();
-                snap_filename += gDirUtilp->getDirDelimiter();
-                snap_filename += SCREEN_LAST_FILENAME;
-                // use full pixel dimensions of viewer window (not post-scale dimensions)
-                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, TRUE);
-                mSavedFinalSnapshot = TRUE;
+                std::string snap_filename = gDirUtilp->getLindenUserDir(true);
+                if (!snap_filename.empty())
+                {
+                        snap_filename += gDirUtilp->getDirDelimiter();
+                        snap_filename += SCREEN_LAST_FILENAME;
+                        // use full pixel dimensions of viewer window (not post-scale dimensions)
+                        gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, TRUE);
+                        mSavedFinalSnapshot = TRUE;
+                }
         }
 }