13 files changed, 75 insertions, 50 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index fdf8bcf..004d063 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -57,6 +57,7 @@
 #include "llimagegl.h"
 #include "llwindow.h"
 #include "lltextparser.h"
+#include "lldir.h"
 #include <queue>
 
 #include "llmenugl.h"
@@ -4205,7 +4206,10 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
                                                                          const std::string& font_name)
 {
         LLColor4 lcolor=color;
-        if (mParseHighlights)
+        // If LindenUserDir is empty then we didn't login yet.
+        // In that case we can't instantiate LLTextParser, which
+        // is initialized per user.
+        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();
                 highlight->parseFullLineHighlights(new_text, &lcolor);
@@ -4285,7 +4289,10 @@ void LLTextEditor::appendHighlightedText(const std::string &new_text,
                                                                                  S32  highlight_part,
                                                                                  LLStyleSP stylep)
 {
-        if (mParseHighlights) 
+        // If LindenUserDir is empty then we didn't login yet.
+        // In that case we can't instantiate LLTextParser, which
+        // is initialized per user.
+        if (mParseHighlights && !gDirUtilp->getLindenUserDir(true).empty())
         {
                 LLTextParser* highlight = LLTextParser::getInstance();
                 
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 5567fdd..cd1e98d 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -192,8 +192,9 @@ const std::string &LLDir::getOSUserAppDir() const
         return mOSUserAppDir;
 }
 
-const std::string &LLDir::getLindenUserDir() const
+const std::string &LLDir::getLindenUserDir(bool empty_ok) const
 {
+        llassert(empty_ok || !mLindenUserDir.empty());
         return mLindenUserDir;
 }
 
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 55574d6..766f351 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -92,7 +92,7 @@ class LLDir
         const std::string &getAppRODataDir() const;     // Location of read-only data files
         const std::string &getOSUserDir() const;                // Location of the os-specific user dir
         const std::string &getOSUserAppDir() const;     // Location of the os-specific user app dir
-        const std::string &getLindenUserDir() const;    // Location of the Linden user dir.
+        const std::string &getLindenUserDir(bool empty_ok = false) const;       // Location of the Linden user dir.
         const std::string &getChatLogsDir() const;      // Location of the chat logs dir.
         const std::string &getPerAccountChatLogsDir() const;    // Location of the per account chat logs dir.
         const std::string &getTempDir() const;                  // Common temporary directory
diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp
index ec0a4f4..5f1eabb 100644
--- a/linden/indra/llvfs/lldir_linux.cpp
+++ b/linden/indra/llvfs/lldir_linux.cpp
@@ -97,7 +97,7 @@ LLDir_Linux::LLDir_Linux()
         mAppRODataDir = tmp_str;
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = tmp_str;
+        mLindenUserDir = "";
 
         char path [32]; /* Flawfinder: ignore */ 
 
diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index c647e2b..5132455 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -100,7 +100,7 @@ LLDir_Solaris::LLDir_Solaris()
         mAppRODataDir = strdup(tmp_str);
         mOSUserDir = getCurrentUserHome(tmp_str);
         mOSUserAppDir = "";
-        mLindenUserDir = tmp_str;
+        mLindenUserDir = "";
 
         char path [LL_MAX_PATH];        /* Flawfinder: ignore */ 
 
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;
+                }
         }
 }
 
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index a6eaeb3..0b71030 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -1360,7 +1360,7 @@ void LLIMMgr::saveIgnoreGroup()
 {
         // llinfos << "saving ignore_groups.xml" << llendl;
 
-        std::string user_dir = gDirUtilp->getLindenUserDir();
+        std::string user_dir = gDirUtilp->getLindenUserDir(true);
         if (!user_dir.empty())
         {
                 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "ignore_groups.xml");
diff --git a/linden/indra/newview/llmutelist.cpp b/linden/indra/newview/llmutelist.cpp
index 0e03509..fff5558 100644
--- a/linden/indra/newview/llmutelist.cpp
+++ b/linden/indra/newview/llmutelist.cpp
@@ -265,7 +265,7 @@ LLMuteList::~LLMuteList()
         // If we quit from the login screen we will not have an SL account
         // name.  Don't try to save, otherwise we'll dump a file in
         // C:\Program Files\SecondLife\  JC
-        std::string user_dir = gDirUtilp->getLindenUserDir();
+        std::string user_dir = gDirUtilp->getLindenUserDir(true);
         if (!user_dir.empty())
         {
                 std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "volume_settings.xml");
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 7bd5fff..fad3df2 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -839,7 +839,7 @@ bool idle_startup()
                         LLToolMgr::getInstance()->initTools();
 
                         // Quickly get something onscreen to look at.
-                        gViewerWindow->initWorldUI();
+                        gViewerWindow->pre_initWorldUI();
                 }
                 
                 gViewerWindow->setNormalControlsVisible( FALSE );       
@@ -1823,6 +1823,10 @@ bool idle_startup()
         {
                 LL_DEBUGS("AppInitStartupState") << "STATE_WORLD_INIT" << LL_ENDL;
                 set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
+
+                // Initialize the rest of the world.
+                gViewerWindow->initWorldUI();
+
                 gDisconnected=FALSE;
                 display_startup();
                 // We should have an agent id by this point.
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index fbd14bc..b187f3b 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -74,7 +74,7 @@ bool LLURLHistory::loadFile(const std::string& filename)
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
 {       
-        std::string temp_str = gDirUtilp->getLindenUserDir();
+        std::string temp_str = gDirUtilp->getLindenUserDir(true);
         if( temp_str.empty() )
         {
                 llwarns << "Can't save " << filename 
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 57c2111..5c01b25 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -471,7 +471,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
                 // at the login page displaying login Web page or Web browser test via Develop menu.
                 // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
                 // is what we always used before this change)
-                std::string linden_user_dir = gDirUtilp->getLindenUserDir();
+                std::string linden_user_dir = gDirUtilp->getLindenUserDir(true);
                 if ( ! linden_user_dir.empty() )
                 {
                         // gDirUtilp->getLindenUserDir() is whole path, not just Linden name
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 5cd730a..07fef53 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1652,7 +1652,7 @@ void LLViewerWindow::adjustControlRectanglesForFirstUse(const LLRect& window)
         adjust_rect_top_center("FloaterCameraRect3", window);
 }
 
-void LLViewerWindow::initWorldUI()
+void LLViewerWindow::pre_initWorldUI()
 {
         pre_init_menus();
 
@@ -1672,9 +1672,45 @@ void LLViewerWindow::initWorldUI()
         gHoverView = new LLHoverView(std::string("gHoverView"), full_window);
         gHoverView->setVisible(TRUE);
         mRootView->addChild(gHoverView);
-                
+
         gIMMgr = LLIMMgr::getInstance();
 
+        // Make sure we only create menus once per session -- MC
+        if (!gMenuHolder)
+        {
+                init_menus();
+        }
+
+        if (!gFloaterTools)
+        {
+                gFloaterTools = new LLFloaterTools();
+                gFloaterTools->setVisible(FALSE);
+        }
+
+        // menu holder appears on top to get first pass at all mouse events
+
+        mRootView->sendChildToFront(gMenuHolder);
+
+        if ( gHUDView == NULL )
+        {
+                LLRect hud_rect = full_window;
+                hud_rect.mBottom += 50;
+                if (gMenuBarView)
+                {
+                        hud_rect.mTop -= gMenuBarView->getRect().getHeight();
+                }
+                gHUDView = new LLHUDView(hud_rect);
+                // put behind everything else in the UI
+                mRootView->addChildAtEnd(gHUDView);
+        }
+}
+
+void LLViewerWindow::initWorldUI()
+{
+        S32 height = mRootView->getRect().getHeight();
+        S32 width = mRootView->getRect().getWidth();
+        LLRect full_window(0, height, width, 0);
+
         if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") )
         {
                 LLFloaterChat::getInstance(LLSD())->loadHistory();
@@ -1715,18 +1751,6 @@ void LLViewerWindow::initWorldUI()
 
         // Toolbox floater
 
-        // Make sure we only create menus once per session -- MC
-        if (!gMenuHolder)
-        {
-                init_menus();
-        }
-
-        if (!gFloaterTools)
-        {
-                gFloaterTools = new LLFloaterTools();
-                gFloaterTools->setVisible(FALSE);
-        }
-
         if (!gStatusBar)
         {
                 // Status bar
@@ -1744,24 +1768,6 @@ void LLViewerWindow::initWorldUI()
         }
 
         LLFloaterChatterBox::createInstance(LLSD());
-
-
-        // menu holder appears on top to get first pass at all mouse events
-
-        mRootView->sendChildToFront(gMenuHolder);
-
-        if ( gHUDView == NULL )
-        {
-                LLRect hud_rect = full_window;
-                hud_rect.mBottom += 50;
-                if (gMenuBarView)
-                {
-                        hud_rect.mTop -= gMenuBarView->getRect().getHeight();
-                }
-                gHUDView = new LLHUDView(hud_rect);
-                // put behind everything else in the UI
-                mRootView->addChildAtEnd(gHUDView);
-        }
 }
 
 // Destroy the UI
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 85cdc52..ee8f3fe 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -143,6 +143,7 @@ public:
         void                    initBase();
         void                    adjustRectanglesForFirstUse(const LLRect& window);
         void            adjustControlRectanglesForFirstUse(const LLRect& window);
+        void                    pre_initWorldUI();
         void                    initWorldUI();
 
         //