1 files changed, 642 insertions, 961 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index cb94e51..7c71e46 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -32,10 +32,11 @@
 
 #include "llviewerprecompiledheaders.h"
 #include "llappviewer.h"
+#include "llprimitive.h"
 
 #include "llversionviewer.h"
 #include "llfeaturemanager.h"
-#include "llvieweruictrlfactory.h"
+#include "lluictrlfactory.h"
 #include "llalertdialog.h"
 #include "llerrorcontrol.h"
 #include "llviewerimagelist.h"
@@ -45,12 +46,12 @@
 #include "llviewerstats.h"
 #include "llmd5.h"
 #include "llpumpio.h"
-#include "llfloateractivespeakers.h"
 #include "llimpanel.h"
 #include "llmimetypes.h"
 #include "llstartup.h"
 #include "llfocusmgr.h"
 #include "llviewerjoystick.h"
+#include "llfloaterjoystick.h"
 #include "llares.h" 
 #include "llcurl.h"
 #include "llfloatersnapshot.h"
@@ -62,10 +63,13 @@
 #include "llmutelist.h"
 #include "llurldispatcher.h"
 #include "llurlhistory.h"
+#include "llfirstuse.h"
 
 #include "llweb.h"
 #include "llsecondlifeurls.h"
 
+#include <boost/bind.hpp>
+
 #if LL_WINDOWS
         #include "llwindebug.h"
 #endif
@@ -93,7 +97,6 @@
 #include "lltoolmgr.h"
 #include "llassetstorage.h"
 #include "llpolymesh.h"
-#include "lleconomy.h"
 #include "llcachename.h"
 #include "audioengine.h"
 #include "llviewermenu.h"
@@ -108,6 +111,7 @@
 #include "lldebugview.h"
 #include "llconsole.h"
 #include "llcontainerview.h"
+#include "llfloaterstats.h"
 #include "llhoverview.h"
 
 #include "llsdserialize.h"
@@ -148,14 +152,12 @@
 #include "llvieweraudio.h"
 #include "llimview.h"
 #include "llviewerthrottle.h"
+#include "llparcel.h"
 // 
 
 #include "llinventoryview.h"
 
-// *FIX: Remove these once the command line params thing is figured out.
-// Yuck!
-static int gTempArgC = 0;
-static char** gTempArgV;
+#include "llcommandlineparser.h"
 
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
@@ -168,7 +170,6 @@ static char** gTempArgV;
 //----------------------------------------------------------------------------
 // llviewernetwork.h
 #include "llviewernetwork.h"
-// extern EGridInfo gGridChoice;
 
 
 ////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor
@@ -210,26 +211,13 @@ extern OSStatus DisplayReleaseNotes(void);
 #endif // LL_DARWIN
 
 
-#include "moviemaker.h"
-extern BOOL gbCapturing;
-
-#if !LL_SOLARIS
-        extern MovieMaker gMovieMaker;
-#endif
-
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-bool gVerifySSLCert = true;
 BOOL gHandleKeysAsync = FALSE;
 
-BOOL gProbeHardware = TRUE; // Use DirectX 9 to probe for hardware
-
-S32 gYieldMS = 0; // set in parse_args, used in mainLoop
-BOOL gYieldTime = FALSE;
-
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
@@ -240,25 +228,13 @@ LLString gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle
 BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
 
 BOOL                            gAllowIdleAFK = TRUE;
-F32                                     gAFKTimeout = DEFAULT_AFK_TIMEOUT;
+BOOL                            gAllowTapTapHoldRun = TRUE;
 BOOL                            gShowObjectUpdates = FALSE;
-BOOL gLogMessages = FALSE;
-std::string gChannelName = LL_CHANNEL;
-BOOL gUseAudio = TRUE;
 BOOL gUseQuickTime = TRUE;
-LLString gCmdLineFirstName;
-LLString gCmdLineLastName;
-LLString gCmdLinePassword;
-
-BOOL                            gAutoLogin = FALSE;
 
-const char*                     DEFAULT_SETTINGS_FILE = "settings.xml";
-BOOL gRequestInventoryLibrary = TRUE;
-BOOL gGodConnect = FALSE;
 BOOL gAcceptTOS = FALSE;
 BOOL gAcceptCriticalMessage = FALSE;
 
-LLUUID                          gViewerDigest;  // MD5 digest of the viewer's executable file.
 eLastExecEvent gLastExecEvent = LAST_EXEC_NORMAL;
 
 LLSD gDebugInfo;
@@ -285,7 +261,6 @@ F32					gLogoutMaxTime = LOGOUT_REQUEST_TIME;
 LLUUID gInventoryLibraryOwner;
 LLUUID gInventoryLibraryRoot;
 
-BOOL                            gDisableVoice = FALSE;
 BOOL                            gDisconnected = FALSE;
 
 // Map scale in pixels per region
@@ -297,17 +272,11 @@ LLFrameTimer	gRestoreGLTimer;
 BOOL                    gRestoreGL = FALSE;
 BOOL                            gUseWireframe = FALSE;
 
-F32                                     gMouseSensitivity = 3.f;
-BOOL                            gInvertMouse = FALSE;
-
 // VFS globals - see llappviewer.h
 LLVFS* gStaticVFS = NULL;
 
 LLMemoryInfo gSysMemory;
 
-bool gPreloadImages = true;
-bool gPreloadSounds = true;
-
 LLString gLastVersionChannel;
 
 LLVector3                       gWindVec(3.0, 3.0, 0.0);
@@ -317,34 +286,16 @@ U32		gPacketsIn = 0;
 
 BOOL                            gPrintMessagesThisFrame = FALSE;
 
-BOOL gUseConsole = TRUE;
-
 BOOL gRandomizeFramerate = FALSE;
 BOOL gPeriodicSlowFrame = FALSE;
 
-BOOL gQAMode = FALSE;
+BOOL gCrashOnStartup = FALSE;
 BOOL gLLErrorActivated = FALSE;
 BOOL gLogoutInProgress = FALSE;
 ////////////////////////////////////////////////////////////
 // Internal globals... that should be removed.
-static F32 gQuitAfterSeconds = 0.f;
-static BOOL gRotateRight = FALSE;
-static BOOL gIgnorePixelDepth = FALSE;
-
-// Allow multiple viewers in ReleaseForDownload
-#if LL_RELEASE_FOR_DOWNLOAD
-static BOOL gMultipleViewersOK = FALSE;
-#else
-static BOOL gMultipleViewersOK = TRUE;
-#endif
-
-static std::map<std::string, std::string> gCommandLineSettings;
-static std::map<std::string, std::string> gCommandLineForcedSettings;
-
 static LLString gArgs;
 
-static LLString gOldSettingsFileName;
-static const char* LEGACY_DEFAULT_SETTINGS_FILE = "settings.ini";
 const char* MARKER_FILE_NAME = "SecondLife.exec_marker";
 const char* ERROR_MARKER_FILE_NAME = "SecondLife.error_marker";
 const char* LLERROR_MARKER_FILE_NAME = "SecondLife.llerror_marker";
@@ -367,52 +318,10 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
-static const char USAGE[] = "\n"
-"usage:\tviewer [options]\n"
-"options:\n"
-" -login <first> <last> <password>     log in as a user\n"
-" -autologin                           log in as last saved user\n"
-" -loginpage <URL>                     login authentication page to use\n"
-" -loginuri <URI>                      login server and CGI script to use\n"
-" -helperuri <URI>                     helper web CGI prefix to use\n"
-" -settings <filename>                 specify the filename of a\n"
-"                                        configuration file\n"
-"                                        default is settings.xml\n"
-" -setdefault <variable> <value>       specify the value of a particular\n"
-"                                        configuration variable which can be\n"
-"                                        overridden by settings.xml\n"
-" -set <variable> <value>              specify the value of a particular\n"
-"                                        configuration variable that\n"
-"                                        overrides all other settings\n"
-#if !LL_RELEASE_FOR_DOWNLOAD
-" -sim <simulator_ip>                  specify the simulator ip address\n"
-#endif
-" -god                                     log in as god if you have god access\n"
-" -purge                               delete files in cache\n"
-" -safe                                reset preferences, run in safe mode\n"
-" -noutc                               logs in local time, not UTC\n"
-" -nothread                            run vfs in single thread\n"
-" -noinvlib                            Do not request inventory library\n"
-" -multiple                            allow multiple viewers\n"
-" -nomultiple                          block multiple viewers\n"
-" -novoice                             disable voice\n"
-" -ignorepixeldepth                    ignore pixel depth settings\n"
-" -cooperative [ms]                    yield some idle time to local host\n"
-" -skin                                ui/branding skin folder to use\n"
-#if LL_WINDOWS
-" -noprobe                             disable hardware probe\n"
-#endif
-" -noquicktime                         disable QuickTime movies, speeds startup\n"
-" -nopreload                           don't preload UI images or sounds, speeds startup\n"
-// these seem to be unused
-//" -noenv                               turn off environmental effects\n"
-//" -proxy <proxy_ip>                    specify the proxy ip address\n"
-"\n";
-
 void idle_afk_check()
 {
         // check idle timers
-        if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gAFKTimeout))
+        if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
         {
                 gAgent.setAFK();
         }
@@ -432,8 +341,8 @@ void request_initial_instant_messages()
 {
         static BOOL requested = FALSE;
         if (!requested
-                && gMuteListp
-                && gMuteListp->isLoaded()
+                && gMessageSystem
+                && LLMuteList::getInstance()->isLoaded()
                 && gAgent.getAvatarObject())
         {
                 // Auto-accepted inventory items may require the avatar object
@@ -451,7 +360,7 @@ void request_initial_instant_messages()
 
 // Use these strictly for things that are constructed at startup,
 // or for things that are performance critical.  JC
-static void saved_settings_to_globals()
+static void settings_to_globals()
 {
         LLBUTTON_H_PAD          = gSavedSettings.getS32("ButtonHPad");
         LLBUTTON_V_PAD          = gSavedSettings.getS32("ButtonVPad");
@@ -489,17 +398,18 @@ static void saved_settings_to_globals()
 
         gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
         gAllowIdleAFK = gSavedSettings.getBOOL("AllowIdleAFK");
-        gAFKTimeout = gSavedSettings.getF32("AFKTimeout");
-        gMouseSensitivity = gSavedSettings.getF32("MouseSensitivity");
-        gInvertMouse = gSavedSettings.getBOOL("InvertMouse");
+        gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
         gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
         gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
+}
 
+static void settings_modify()
+{
         LLRenderTarget::sUseFBO                         = gSavedSettings.getBOOL("RenderUseFBO");
-        LLVOAvatar::sUseImpostors                       = gSavedSettings.getBOOL("RenderUseImpostors");
+        LLVOAvatar::sUseImpostors                       = FALSE; //gSavedSettings.getBOOL("RenderUseImpostors");
         LLVOSurfacePatch::sLODFactor            = gSavedSettings.getF32("RenderTerrainLODFactor");
         LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //sqaure lod factor to get exponential range of [1,4]
 
@@ -539,374 +449,75 @@ static void saved_settings_to_globals()
 
         // propagate push to talk preference to current status
         gSavedSettings.setBOOL("PTTCurrentlyEnabled", TRUE); //gSavedSettings.getBOOL("EnablePushToTalk"));
-
-        settings_setup_listeners();
-
-        // gAgent.init() also loads from saved settings.
 }
 
-int parse_args(int argc, char **argv)
+void initGridChoice()
 {
-        // Sometimes IP addresses passed in on the command line have leading
-        // or trailing white space.  Use LLString to clean that up.
-        LLString ip_string;
-        S32 j;
-
-        for (j = 1; j < argc; j++) 
-        {
+    LLString gridChoice = gSavedSettings.getString("GridChoice");
+    if(!gridChoice.empty())
                 // Used to show first chunk of each argument passed in the 
                 // window title.
-                gArgs += argv[j];
-                gArgs += " ";
-
-                LLString argument = argv[j];
-                if ((!strcmp(argv[j], "-port")) && (++j < argc)) 
-                {
-                        sscanf(argv[j], "%u", &(gAgent.mViewerPort));
-                }
-                else if ((!strcmp(argv[j], "-drop")) && (++j < argc)) 
-                {
-                        sscanf(argv[j], "%f", &gPacketDropPercentage);
-                }
-                else if ((!strcmp(argv[j], "-inbw")) && (++j < argc))
-                {
-                        sscanf(argv[j], "%f", &gInBandwidth);
-                }
-                else if ((!strcmp(argv[j], "-outbw")) && (++j < argc))
-                {
-                        sscanf(argv[j], "%f", &gOutBandwidth);
-                }
-                else if (!strcmp(argv[j], "--aditi"))
-                {
-                        gGridChoice = GRID_INFO_ADITI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--agni"))
-                {
-                        gGridChoice = GRID_INFO_AGNI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--aruna"))
-                {
-                        gGridChoice = GRID_INFO_ARUNA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--durga"))
-                {
-                        gGridChoice = GRID_INFO_DURGA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--ganga"))
-                {
-                        gGridChoice = GRID_INFO_GANGA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--mitra"))
-                {
-                        gGridChoice = GRID_INFO_MITRA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--mohini"))
-                {
-                        gGridChoice = GRID_INFO_MOHINI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--nandi"))
-                {
-                        gGridChoice = GRID_INFO_NANDI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--radha"))
-                {
-                        gGridChoice = GRID_INFO_RADHA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--ravi"))
-                {
-                        gGridChoice = GRID_INFO_RAVI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--siva"))
-                {
-                        gGridChoice = GRID_INFO_SIVA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--shakti"))
-                {
-                        gGridChoice = GRID_INFO_SHAKTI;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--soma"))
-                {
-                        gGridChoice = GRID_INFO_SOMA;
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[gGridChoice].mName);            // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--uma"))
-                {
-                        gGridChoice = GRID_INFO_UMA;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--vaak"))
-                {
-                        gGridChoice = GRID_INFO_VAAK;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "--yami"))
-                {
-                        gGridChoice = GRID_INFO_YAMI;
-                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
-                }
-                else if (!strcmp(argv[j], "-loginpage") && (++j < argc))
-                {
-                        LLAppViewer::instance()->setLoginPage(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-loginuri") && (++j < argc))
-                {
-            LLAppViewer::instance()->addLoginURI(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-helperuri") && (++j < argc))
-                {
-            LLAppViewer::instance()->setHelperURI(utf8str_trim(argv[j]));
-                }
-                else if (!strcmp(argv[j], "-debugviews"))
-                {
-                        LLView::sDebugRects = TRUE;
-                }
-                else if (!strcmp(argv[j], "-skin") && (++j < argc))
-                {
-                        std::string folder(argv[j]);
-                        gDirUtilp->setSkinFolder(folder);
-                }
-                else if (!strcmp(argv[j], "-autologin") || !strcmp(argv[j], "--autologin")) // keep --autologin for compatibility
-                {
-                        gAutoLogin = TRUE;
-                }
-                else if (!strcmp(argv[j], "-quitafter") && (++j < argc))
-                {
-                        gQuitAfterSeconds = (F32)atof(argv[j]);
-                }
-                else if (!strcmp(argv[j], "-rotate"))
-                {
-                        gRotateRight = TRUE;
-                }
-//              else if (!strcmp(argv[j], "-noenv")) 
-//              {
-                        //turn OFF environmental effects for slow machines/video cards
-//                      gRequestParaboloidMap = FALSE;
-//              }
-                else if (!strcmp(argv[j], "-noaudio"))
-                {
-                        gUseAudio = FALSE;
-                }
-                else if (!strcmp(argv[j], "-nosound"))  // tends to be popular cmdline on Linux.
-                {
-                        gUseAudio = FALSE;
-                }
-                else if (!strcmp(argv[j], "-noprobe"))
-                {
-                        gProbeHardware = FALSE;
-                }
-                else if (!strcmp(argv[j], "-noquicktime"))
-                {
-                        // Developers can log in faster if they don't load all the
-                        // quicktime dlls.
-                        gUseQuickTime = false;
-                }
-                else if (!strcmp(argv[j], "-nopreload"))
-                {
-                        // Developers can log in faster if they don't decode sounds
-                        // or images on startup, ~5 seconds faster.
-                        gPreloadSounds = false;
-                        gPreloadImages = false;
-                }
-                else if (!strcmp(argv[j], "-purge"))
-                {
-                        LLAppViewer::instance()->purgeCache();
-                }
-                else if(!strcmp(argv[j], "-noinvlib"))
-                {
-                        gRequestInventoryLibrary = FALSE;
-                }
-                else if (!strcmp(argv[j], "-log"))
-                {
-                        gLogMessages = TRUE;
-                        continue;
-                }
-                else if (!strcmp(argv[j], "-logfile") && (++j < argc)) 
-                {
-                        // *NOTE: This buffer size is hard coded into scanf() below.
-                        char logfile[256];      // Flawfinder: ignore
-                        sscanf(argv[j], "%255s", logfile);      // Flawfinder: ignore
-                        llinfos << "Setting log file to " << logfile << llendl;
-                        LLFile::remove(logfile);
-                        LLError::logToFile(logfile);
-                }
-                else if (!strcmp(argv[j], "-settings") && (++j < argc)) 
-                {
-                        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, argv[j]);
-                }
-                else if (!strcmp(argv[j], "-setdefault") && (j + 2 < argc)) 
-                {
-                        std::string control_name;
-                        std::string control_value;
-                        
-                        j++;
-                        if (argv[j]) control_name = std::string(argv[j]);
+    {
+        // find the grid choice from the user setting.
+        int gridIndex = GRID_INFO_NONE; 
+        for(;gridIndex < GRID_INFO_OTHER; ++gridIndex )
+        {
+            if(0 == LLString::compareInsensitive(gGridInfo[gridIndex].mLabel, gridChoice.c_str()))
+            {
+                gGridChoice = (EGridInfo)gridIndex;
+
+                if(GRID_INFO_LOCAL == gGridChoice)
+                {
+                    gGridName = LOOPBACK_ADDRESS_STRING;
+                    break;
+                }
+                else
+                {
+                    gGridName = gGridInfo[gGridChoice].mName;
+                    break;
+                }
+            }
+        }
+
+        if(GRID_INFO_OTHER == gridIndex)
+        {
+                // *FIX:MEP Can and should we validate that this is an IP address?
+                gGridChoice = (EGridInfo)gridIndex;
+                gGridName = llformat("%s", gSavedSettings.getString("GridChoice").c_str());
+
+        }
+    }
 
-                        j++;
-                        if (argv[j]) control_value = std::string(argv[j]);
-                        
-                        // grab control name and value
-                        if (!control_name.empty())
-                        {
-                                gCommandLineSettings[control_name] = control_value;
-                        }
-                }
-                else if (!strcmp(argv[j], "-set") && (j + 2 < argc)) 
-                {
-                        std::string control_name;
-                        std::string control_value;
-                        
-                        j++;
-                        if (argv[j]) control_name = std::string(argv[j]);
 
-                        j++;
-                        if (argv[j]) control_value = std::string(argv[j]);
-                        
-                        // grab control name and value
-                        if (!control_name.empty())
-                        {
-                                gCommandLineForcedSettings[control_name] = control_value;
-                        }
-                }
-                else if (!strcmp(argv[j], "-login"))
-                {
-                        if (j + 3 < argc)
-                        {
-                                j++;
-                                gCmdLineFirstName = argv[j];
-                                j++;
-                                gCmdLineLastName = argv[j];
-                                j++;
-                                gCmdLinePassword = argv[j];
-                        }
-                        else
-                        {
-                                // only works if -login is last parameter on command line
-                                llerrs << "Not enough parameters to -login. Did you mean -loginuri?" << llendl;
-                        }
-                }
-                else if (!strcmp(argv[j], "-god"))
-                {
-                        gGodConnect = TRUE;
-                }
-                else if (!strcmp(argv[j], "-noconsole"))
-                {
-                        gUseConsole = FALSE;
-                }
-                else if (!strcmp(argv[j], "-safe"))
-                {
-                        llinfos << "Setting viewer feature table to run in safe mode, resetting prefs" << llendl;
-                        gFeatureManagerp->setSafe(TRUE);
-                }
-                else if (!strcmp(argv[j], "-multiple"))
-                {
-                        gMultipleViewersOK = TRUE;
-                }
-                else if (!strcmp(argv[j], "-nomultiple"))
-                {
-                        gMultipleViewersOK = FALSE;
-                }
-                else if (!strcmp(argv[j], "-novoice"))
-                {
-                        gDisableVoice = TRUE;
-                }
-                else if (!strcmp(argv[j], "-nothread"))
-                {
-                        LLVFile::ALLOW_ASYNC = FALSE;
-                        llinfos << "Running VFS in nothread mode" << llendl;
-                }
-                // some programs don't respect the command line options in protocol handlers (I'm looking at you, Opera)
-                // so this allows us to parse the URL straight off the command line without a "-url" paramater
-                else if (LLURLDispatcher::isSLURL(argv[j])
-                                 || !strcmp(argv[j], "-url") && (++j < argc)) 
-                {
-                        std::string slurl = argv[j];
-                        if (LLURLDispatcher::isSLURLCommand(slurl))
-                        {
-                                LLStartUp::sSLURLCommand = slurl;
-                        }
-                        else
-                        {
-                                LLURLSimString::setString(slurl);
-                        }
-                        // *NOTE: After setting the url, bail. What can happen is
-                        // that someone can use IE (or potentially other browsers)
-                        // and do the rough equivalent of command injection and
-                        // steal passwords. Phoenix. SL-55321
-                        return 0;
-                }
-                else if (!strcmp(argv[j], "-ignorepixeldepth"))
-                {
-                        gIgnorePixelDepth = TRUE;
-                }
-                else if (!strcmp(argv[j], "-cooperative"))
+#if !LL_RELEASE_FOR_DOWNLOAD
+        if (gGridChoice == GRID_INFO_NONE)
+        {
+                // Development version: load last server choice by default (overridden by cmd line args)
+                S32 server = gSavedSettings.getS32("ServerChoice");
+                if (server != 0)
+                        gGridChoice = (EGridInfo)llclamp(server, 0, (S32)GRID_INFO_COUNT - 1);
+                if (server == GRID_INFO_OTHER)
                 {
-                        S32 ms_to_yield = 0;
-                        if(++j < argc)
+                        LLString custom_server = gSavedSettings.getString("CustomServer");
+                        if (custom_server.empty())
                         {
-                                S32 rv = sscanf(argv[j], "%d", &ms_to_yield);
-                                if(0 == rv)
-                                {
-                                        --j;
-                                }
+                                gGridName = "none";
                         }
                         else
                         {
-                                --j;
+                                gGridName = custom_server.c_str();
                         }
-                        gYieldMS = ms_to_yield;
-                        gYieldTime = TRUE;
-                }
-                else if (!strcmp(argv[j], "-no-verify-ssl-cert"))
-                {
-                        gVerifySSLCert = false;
                 }
-                else if ( (!strcmp(argv[j], "--channel") || !strcmp(argv[j], "-channel"))  && (++j < argc)) 
-                {
-                        gChannelName = argv[j];
-                }
-#if LL_DARWIN
-                else if (!strncmp(argv[j], "-psn_", 5))
-                {
-                        // this is the Finder passing the process session number
-                        // we ignore this
-                }
-#endif
-                else if(!strncmp(argv[j], "-qa", 3))
-                {
-                        // This whole case should disappear with settings clean-up work in QAR-369
-                        // or at least be replaced by setting a boolean in the settings repository. -MG
-                        gQAMode = TRUE;
-                        LLUI::setQAMode(gQAMode);
-                }
-                else if(argument == "-crash")
-                {
-                        LLAppViewer::instance()->forceErrorBadMemoryAccess();
-                }
-                else
-                {
 
-                        // DBC - Mac OS X passes some stuff by default on the command line (e.g. psn).
-                        // Second Life URLs are passed this way as well?
-                        llwarns << "Possible unknown keyword " << argv[j] << llendl;
+        gSavedSettings.setString("GridChoice", gGridInfo[gGridChoice].mLabel);
+        }
+#endif
 
-                        // print usage information
-                        llinfos << USAGE << llendl;
-                        // return 1;
-                }
+        if (gGridChoice == GRID_INFO_NONE)
+        {
+                gGridChoice = GridDefaultChoice;
+        gSavedSettings.setString("GridChoice", gGridInfo[gGridChoice].mLabel);
         }
-        return 0;
 }
 
 bool send_url_to_other_instance(const std::string& url)
@@ -917,6 +528,7 @@ bool send_url_to_other_instance(const std::string& url)
         window_class[255] = 0;
         // Use the class instead of the window name.
         HWND other_window = FindWindow(window_class, NULL);
+
         if (other_window != NULL)
         {
                 lldebugs << "Found other window with the name '" << gWindowTitle << "'" << llendl;
@@ -942,6 +554,10 @@ bool send_url_to_other_instance(const std::string& url)
 // The single viewer app.
 LLAppViewer* LLAppViewer::sInstance = NULL;
 
+const std::string LLAppViewer::sGlobalSettingsName = "Global"; 
+const std::string LLAppViewer::sPerAccountSettingsName = "PerAccount"; 
+const std::string LLAppViewer::sCrashSettingsName = "CrashSettings"; 
+
 LLTextureCache* LLAppViewer::sTextureCache = NULL; 
 LLWorkerThread* LLAppViewer::sImageDecodeThread = NULL; 
 LLTextureFetch* LLAppViewer::sTextureFetch = NULL; 
@@ -952,11 +568,12 @@ LLAppViewer::LLAppViewer() :
         mReportedCrash(false),
         mNumSessions(0),
         mPurgeCache(false),
-    mPurgeOnExit(false),
-    mSecondInstance(false),
+        mPurgeOnExit(false),
+        mSecondInstance(false),
         mSavedFinalSnapshot(false),
-    mQuitRequested(false),
-    mLogoutRequestSent(false)
+        mQuitRequested(false),
+        mLogoutRequestSent(false),
+        mYieldTime(-1)
 {
         if(NULL != sInstance)
         {
@@ -972,13 +589,6 @@ LLAppViewer::~LLAppViewer()
         removeMarkerFile();
 }
 
-bool LLAppViewer::tempStoreCommandOptions(int argc, char** argv)
-{
-        gTempArgC = argc;
-        gTempArgV = argv;
-        return true;
-}
-
 bool LLAppViewer::init()
 {
     // *NOTE:Mani - LLCurl::initClass is not thread safe. 
@@ -987,7 +597,6 @@ bool LLAppViewer::init()
 
     initThreads();
 
-        initEarlyConfiguration();
 
         //
         // Start of the application
@@ -1007,14 +616,19 @@ bool LLAppViewer::init()
         //
         // OK to write stuff to logs now, we've now crash reported if necessary
         //
-
-        // Set up some defaults...
-        gSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, DEFAULT_SETTINGS_FILE);
-        gOldSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, LEGACY_DEFAULT_SETTINGS_FILE);
-
     if (!initConfiguration())
                 return false;
 
+    writeSystemInfo();
+
+        // Build a string representing the current version number.
+    gCurrentVersion = llformat("%s %d.%d.%d.%d", 
+        gSavedSettings.getString("VersionChannelName").c_str(), 
+        LL_VERSION_MAJOR, 
+        LL_VERSION_MINOR, 
+        LL_VERSION_PATCH, 
+        LL_VERSION_BUILD );
+
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
@@ -1022,47 +636,10 @@ bool LLAppViewer::init()
         // *FIX: The following code isn't grouped into functions yet.
 
         //
-        // Write system information into the debug log (CPU, OS, etc.)
+        // Various introspection concerning the libs we're using.
         //
-        writeSystemInfo();
+        llinfos << "J2C Engine is: " << LLImageJ2C::getEngineInfo() << llendl;
 
-        // Build a string representing the current version number.
-        gCurrentVersion = llformat("%s %d.%d.%d.%d", gChannelName.c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD );
-        
-        //
-        // Merge with the command line overrides
-        gSavedSettings.applyOverrides(gCommandLineSettings);
-
-        // Need to do this before calling parseAlerts
-        gUICtrlFactory = new LLViewerUICtrlFactory();
-        
-        // Pre-load alerts.xml to define the warnings settings (always loads from skins/xui/en-us/)
-        // Do this *before* loading the settings file
-        LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
-        
-        // Overwrite default settings with user settings
-        llinfos << "Loading configuration file " << gSettingsFileName << llendl;
-        if (0 == gSavedSettings.loadFromFile(gSettingsFileName))
-        {
-                llinfos << "Failed to load settings from " << gSettingsFileName << llendl;
-                llinfos << "Loading legacy settings from " << gOldSettingsFileName << llendl;
-                gSavedSettings.loadFromFileLegacy(gOldSettingsFileName);
-        }
-
-        // need to do this here - need to have initialized global settings first
-        LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
-        if ( nextLoginLocation.length() )
-        {
-                LLURLSimString::setString( nextLoginLocation.c_str() );
-        };
-
-        // Merge with the command line overrides
-        gSavedSettings.applyOverrides(gCommandLineForcedSettings);
-
-        gLastRunVersion = gSavedSettings.getString("LastRunVersion");
-
-        fixup_settings();
-        
         // Get the single value from the crash settings file, if it exists
         std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
         gCrashSettings.loadFromFile(crash_settings_filename.c_str());
@@ -1101,68 +678,29 @@ bool LLAppViewer::init()
         {
                 LLError::setPrintLocation(true);
         }
-
-#if !LL_RELEASE_FOR_DOWNLOAD
-        if (gGridChoice == GRID_INFO_NONE)
-        {
-                // Development version: load last server choice by default (overridden by cmd line args)
-                
-                S32 server = gSavedSettings.getS32("ServerChoice");
-                if (server != 0)
-                        gGridChoice = (EGridInfo)llclamp(server, 0, (S32)GRID_INFO_COUNT - 1);
-                if (server == GRID_INFO_OTHER)
-                {
-                        LLString custom_server = gSavedSettings.getString("CustomServer");
-                        if (custom_server.empty())
-                        {
-                                snprintf(gGridName, MAX_STRING, "none");                /* Flawfinder: ignore */
-                        }
-                        else
-                        {
-                                snprintf(gGridName, MAX_STRING, "%s", custom_server.c_str());           /* Flawfinder: ignore */
-                        }
-                }
-        }
-#endif
-
-        if (gGridChoice == GRID_INFO_NONE)
-        {
-                gGridChoice = GridDefaultChoice;
-        }
         
         // Load art UUID information, don't require these strings to be declared in code.
-        LLString viewer_art_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"viewerart.xml");
-        llinfos << "Loading art table from " << viewer_art_filename << llendl;
-        gViewerArt.loadFromFile(viewer_art_filename.c_str(), FALSE);
-        LLString textures_filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "textures", "textures.xml");
-        llinfos << "Loading art table from " << textures_filename << llendl;
-        gViewerArt.loadFromFile(textures_filename.c_str(), FALSE);
-
         LLString colors_base_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors_base.xml");
         llinfos << "Loading base colors from " << colors_base_filename << llendl;
-        gColors.loadFromFile(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
+        gColors.loadFromFileLegacy(colors_base_filename.c_str(), FALSE, TYPE_COL4U);
 
         // Load overrides from user colors file
         LLString user_colors_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors.xml");
         llinfos << "Loading user colors from " << user_colors_filename << llendl;
-        if (gColors.loadFromFile(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
+        if (gColors.loadFromFileLegacy(user_colors_filename.c_str(), FALSE, TYPE_COL4U) == 0)
         {
-                llinfos << "Failed to load user colors from " << user_colors_filename << llendl;
-                LLString user_legacy_colors_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "colors.ini");
-                llinfos << "Loading legacy colors from " << user_legacy_colors_filename << llendl;
-                gColors.loadFromFileLegacy(user_legacy_colors_filename.c_str(), FALSE, TYPE_COL4U);
+                llinfos << "Cannot load user colors from " << user_colors_filename << llendl;
         }
 
         // Widget construction depends on LLUI being initialized
         LLUI::initClass(&gSavedSettings, 
                                         &gColors, 
-                                        &gViewerArt,
-                                        &gImageList,
+                                        LLUIImageList::getInstance(),
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
 
         LLWeb::initClass();                       // do this after LLUI
-        gUICtrlFactory->setupPaths(); // update paths with correct language set
+        LLUICtrlFactory::getInstance()->setupPaths(); // update paths with correct language set
         
         /////////////////////////////////////////////////
         //
@@ -1173,16 +711,18 @@ bool LLAppViewer::init()
 
         LLAgent::parseTeleportMessages("teleport_strings.xml");
 
+        LLViewerJointMesh::updateVectorize();
+
         // load MIME type -> media impl mappings
         LLMIMETypes::parseMIMETypes( "mime_types.xml" ); 
 
-        mCrashBehavior = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING);
-
-        LLVectorPerformanceOptions::initClass();
-
-        // Move certain saved settings into global variables for speed
-        saved_settings_to_globals();
 
+        // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
+        settings_to_globals();
+        // Setup settings listeners
+        settings_setup_listeners();
+        // Modify settings based on system configuration and compile options
+        settings_modify();
 
         // Find partition serial number (Windows) or hardware serial (Mac)
         mSerialNumber = generateSerialNumber();
@@ -1203,7 +743,7 @@ bool LLAppViewer::init()
         MemSetErrorHandler(first_mem_error_handler);
 #endif // LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
 
-        gViewerStats = new LLViewerStats();
+        // *Note: this is where gViewerStats used to be created.
 
         //
         // Initialize the VFS, and gracefully handle initialization errors
@@ -1262,17 +802,6 @@ bool LLAppViewer::init()
         // Load Custom bindings (override defaults)
         gViewerKeyboard.loadBindings(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"custom_keys.ini").c_str());
 
-        // Calculate the digest for the executable (takes < 90ms on a fast machine).
-        FILE* app_file = LLFile::fopen( gDirUtilp->getExecutablePathAndName().c_str(), "rb" );          /* Flawfinder: ignore */
-        if( app_file )
-        {
-                LLMD5 app_md5;
-                app_md5.update( app_file ); // Automatically closes the file
-                app_md5.finalize();
-                app_md5.raw_digest( gViewerDigest.mData );
-        }
-        llinfos << "Viewer Digest: " << gViewerDigest << llendl;
-
         // If we don't have the right GL requirements, exit.
         if (!gGLManager.mHasRequirements && !gNoRender)
         {       
@@ -1303,7 +832,7 @@ bool LLAppViewer::init()
                 minRAMString >> minRAM;
                 minRAM = minRAM * 1024 * 1024;
 
-                if(!gFeatureManagerp->isGPUSupported())
+                if(!LLFeatureManager::getInstance()->isGPUSupported())
                 {
                         minSpecs += LLAlertDialog::getTemplateMessage("UnsupportedGPU");
                         minSpecs += "\n";
@@ -1338,6 +867,16 @@ bool LLAppViewer::init()
         gSimLastTime = gRenderStartTime.getElapsedTimeF32();
         gSimFrames = (F32)gFrameCount;
 
+        LLViewerJoystick::getInstance()->init(false);
+        if (LLViewerJoystick::getInstance()->isLikeSpaceNavigator())
+        {
+                if (gSavedSettings.getString("JoystickInitialized") != "SpaceNavigator")
+                {
+                        LLFloaterJoystick::setSNDefaults();
+                        gSavedSettings.setString("JoystickInitialized", "SpaceNavigator");
+                }
+        }
+        
         return true;
 }
 
@@ -1352,9 +891,7 @@ bool LLAppViewer::mainLoop()
         LLHTTPClient::setPump(*gServicePump);
         LLCurl::setCAFile(gDirUtilp->getCAFile());
         
-        // initialize voice stuff here
-        gLocalSpeakerMgr = new LLLocalSpeakerMgr();
-        gActiveChannelSpeakerMgr = new LLActiveSpeakerMgr();
+        // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be instantiated.
 
         LLVoiceChannel::initClass();
         LLVoiceClient::init(gServicePump);
@@ -1362,7 +899,9 @@ bool LLAppViewer::mainLoop()
         LLMemType mt1(LLMemType::MTYPE_MAIN);
         LLTimer frameTimer,idleTimer;
         LLTimer debugTime;
-        
+        LLViewerJoystick* joystick(LLViewerJoystick::getInstance());
+        joystick->setNeedsReset(true);
+        
         // Handle messages
         while (!LLApp::isExiting())
         {
@@ -1383,7 +922,7 @@ bool LLAppViewer::mainLoop()
                                 gViewerWindow->mWindow->gatherInput();
                         }
 
-#if 1 && !RELEASE_FOR_DOWNLOAD
+#if 1 && !LL_RELEASE_FOR_DOWNLOAD
                         // once per second debug info
                         if (debugTime.getElapsedTimeF32() > 1.f)
                         {
@@ -1403,8 +942,8 @@ bool LLAppViewer::mainLoop()
                                         && !gViewerWindow->getShowProgress()
                                         && !gFocusMgr.focusLocked())
                                 {
+                                        joystick->scanJoystick();
                                         gKeyboard->scanKeyboard();
-                                        LLViewerJoystick::scanJoystick();
                                 }
 
                                 // Update state based on messages, user input, object idle.
@@ -1434,12 +973,6 @@ bool LLAppViewer::mainLoop()
 
                                         LLFloaterSnapshot::update(); // take snapshots
                                         
-#if !LL_SOLARIS
-                                        if (gbCapturing)
-                                        {
-                                                gMovieMaker.Snap();
-                                        }
-#endif
 #if LL_WINDOWS && LL_LCD_COMPILE
                                         // update LCD Screen
                                         gLcdScreen->UpdateDisplay();
@@ -1454,9 +987,9 @@ bool LLAppViewer::mainLoop()
                                 bool run_multiple_threads = gSavedSettings.getBOOL("RunMultipleThreads");
 
                                 // yield some time to the os based on command line option
-                                if(gYieldTime)
+                                if(mYieldTime >= 0)
                                 {
-                                        ms_sleep(gYieldMS);
+                                        ms_sleep(mYieldTime);
                                 }
 
                                 // yield cooperatively when not running as foreground window
@@ -1589,15 +1122,11 @@ bool LLAppViewer::cleanup()
         gTransferManager.cleanup();
 #endif
         
-        // Clean up map data storage
-        delete gWorldMap;
-        gWorldMap = NULL;
+        // Note: this is where gWorldMap used to be deleted.
 
-        delete gHUDManager;
-        gHUDManager = NULL;
-
-        delete gToolMgr;
-        gToolMgr = NULL;
+        // Note: this is where gHUDManager used to be deleted.
+        LLHUDManager::getInstance()->shutdownClass();
+        
 
         delete gAssetStorage;
         gAssetStorage = NULL;
@@ -1607,17 +1136,12 @@ bool LLAppViewer::cleanup()
         delete gCacheName;
         gCacheName = NULL;
 
-        delete gGlobalEconomy;
-        gGlobalEconomy = NULL;
-
-        delete gActiveChannelSpeakerMgr;
-        gActiveChannelSpeakerMgr = NULL;
-
-        delete gLocalSpeakerMgr;
-        gLocalSpeakerMgr = NULL;
+        // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted.
 
         LLNotifyBox::cleanup();
 
+        LLWorldMap::getInstance()->reset(); // release any images
+        
         llinfos << "Global stuff deleted" << llendflush;
 
 #if !LL_RELEASE_FOR_DOWNLOAD
@@ -1631,9 +1155,7 @@ bool LLAppViewer::cleanup()
         llwarns << "Hack, skipping audio engine cleanup" << llendflush;
 #endif
 
-        llinfos << "Cleaning up feature manager" << llendflush;
-        delete gFeatureManagerp;
-        gFeatureManagerp = NULL;
+        // Note: this is where LLFeatureManager::getInstance()-> used to be deleted.
 
         // Patch up settings for next time
         // Must do this before we delete the viewer window,
@@ -1709,20 +1231,22 @@ bool LLAppViewer::cleanup()
         gLcdScreen = NULL;
 #endif
 
-        if (!gVolumeMgr->cleanup())
+        LLVolumeMgr* volume_manager = LLPrimitive::getVolumeManager();
+        if (!volume_manager->cleanup())
         {
                 llwarns << "Remaining references in the volume manager!" << llendflush;
         }
+        LLPrimitive::cleanupVolumeManager();
 
         LLViewerParcelMgr::cleanupGlobals();
 
-        delete gViewerStats;
-        gViewerStats = NULL;
+        // *Note: this is where gViewerStats used to be deleted.
 
         //end_messaging_system();
 
         LLFollowCamMgr::cleanupClass();
-        LLVolumeMgr::cleanupClass();
+        //LLVolumeMgr::cleanupClass();
+        LLPrimitive::cleanupVolumeManager();
         LLWorldMapView::cleanupClass();
         LLUI::cleanupClass();
         
@@ -1739,36 +1263,26 @@ bool LLAppViewer::cleanup()
 
         // Must do this after all panels have been deleted because panels that have persistent rects
         // save their rects on delete.
-        gSavedSettings.saveToFile(gSettingsFileName, TRUE);
-        if (!gPerAccountSettingsFileName.empty())
-        {
-                gSavedPerAccountSettings.saveToFile(gPerAccountSettingsFileName, TRUE);
-        }
+        gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);        
+
+        // PerAccountSettingsFile should be empty if no use has been logged on.
+        // *FIX:Mani This should get really saved in a "logoff" mode. 
+        gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
         llinfos << "Saved settings" << llendflush;
 
         std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
         // save all settings, even if equals defaults
         gCrashSettings.saveToFile(crash_settings_filename.c_str(), FALSE);
 
-        delete gUICtrlFactory;
-        gUICtrlFactory = NULL;
-
         gSavedSettings.cleanup();
-        gViewerArt.cleanup();
         gColors.cleanup();
         gCrashSettings.cleanup();
 
         // Save URL history file
         LLURLHistory::saveFile("url_history.xml");
 
-        if (gMuteListp)
-        {
-                // save mute list
-                gMuteListp->cache(gAgent.getID());
-
-                delete gMuteListp;
-                gMuteListp = NULL;
-        }
+        // save mute list. gMuteList used to also be deleted here too.
+        LLMuteList::getInstance()->cache(gAgent.getID());
 
         if (mPurgeOnExit)
         {
@@ -1838,10 +1352,10 @@ bool LLAppViewer::cleanup()
         
         end_messaging_system();
 
-    // *NOTE:Mani - The following call is not thread safe. 
-    LLCurl::cleanupClass();
+        // *NOTE:Mani - The following call is not thread safe. 
+        LLCurl::cleanupClass();
 
-    // If we're exiting to launch an URL, do that here so the screen
+        // If we're exiting to launch an URL, do that here so the screen
         // is at the right resolution before we launch IE.
         if (!gLaunchFileOnQuit.empty())
         {
@@ -1862,106 +1376,6 @@ bool LLAppViewer::cleanup()
         return true;
 }
 
-bool LLAppViewer::initEarlyConfiguration()
-{
-        // *FIX: globals - This method sets a bunch of globals early in the init process.
-        int argc = gTempArgC;
-        char** argv = gTempArgV;
-
-        // HACK! We REALLY want to know what grid they were trying to connect to if they
-        // crashed hard.
-        // So we walk through the command line args ONLY looking for the
-        // userserver arguments first.  And we don't do ANYTHING but set
-        // the gGridName (which gets passed to the crash reporter).
-        // We're assuming that they're trying to log into the same grid as last
-        // time, which seems fairly reasonable.
-        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GridDefaultChoice].mName);              // Flawfinder: ignore
-        S32 j;
-        for (j = 1; j < argc; j++) 
-        {
-                if (!strcmp(argv[j], "--aditi"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_ADITI].mName);                // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--agni"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_AGNI].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--siva"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_SIVA].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--shakti"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_SHAKTI].mName);
-                }
-                else if (!strcmp(argv[j], "--durga"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_DURGA].mName);                // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--soma"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_SOMA].mName);         // Flawfinder: ignore
-                }
-                else if (!strcmp(argv[j], "--ganga"))
-                {
-                        snprintf(gGridName, MAX_STRING, "%s", gGridInfo[GRID_INFO_GANGA].mName);                // Flawfinder: ignore 
-                }
-                else if (!strcmp(argv[j], "--vaak"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_VAAK].mName);
-                }
-                else if (!strcmp(argv[j], "--uma"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_UMA].mName);
-                }
-                else if (!strcmp(argv[j], "--mohini"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MOHINI].mName);
-                }
-                else if (!strcmp(argv[j], "--yami"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_YAMI].mName);
-                }
-                else if (!strcmp(argv[j], "--nandi"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_NANDI].mName);
-                }
-                else if (!strcmp(argv[j], "--mitra"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MITRA].mName);
-                }
-                else if (!strcmp(argv[j], "--radha"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RADHA].mName);
-                }
-                else if (!strcmp(argv[j], "--ravi"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RAVI].mName);
-                }
-                else if (!strcmp(argv[j], "--aruna"))
-                {
-                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_ARUNA].mName);
-                }
-                else if (!strcmp(argv[j], "-multiple"))
-                {
-                        // Hack to detect -multiple so we can disable the marker file check (which will always fail)
-                        gMultipleViewersOK = TRUE;
-                }
-                else if (!strcmp(argv[j], "-novoice"))
-                {
-                        // May need to know this early also
-                        gDisableVoice = TRUE;
-                }
-                else if (!strcmp(argv[j], "-url") && (++j < argc)) 
-                {
-                        LLURLSimString::setString(argv[j]);
-                }
-        }
-
-        return true;
-}
-
 bool LLAppViewer::initThreads()
 {
 #if MEM_TRACK_MEM
@@ -2022,14 +1436,359 @@ bool LLAppViewer::initLogging()
         return true;
 }
 
+void LLAppViewer::loadSettingsFromDirectory(ELLPath path_index)
+{
+        for(LLSD::map_iterator itr = mSettingsFileList.beginMap(); itr != mSettingsFileList.endMap(); ++itr)
+        {
+                LLString settings_name = (*itr).first;
+                LLString settings_file = mSettingsFileList[settings_name].asString();
+
+                LLString full_settings_path = gDirUtilp->getExpandedFilename(path_index, settings_file);
+
+                if(settings_name == sGlobalSettingsName)
+                {
+                        // The non-persistent setting, ClientSettingsFile, specifies a 
+                        // custom name to use for the global settings file.
+                        std::string custom_path;
+                        if(gSettings[sGlobalSettingsName]->controlExists("ClientSettingsFile"))
+                        {
+                                custom_path = 
+                                        gSettings[sGlobalSettingsName]->getString("ClientSettingsFile");
+                        }
+                        if(!custom_path.empty())
+                        {
+                                full_settings_path = custom_path;
+                        }
+                }
+
+                if(gSettings.find(settings_name) == gSettings.end())
+                {
+                        llwarns << "Cannot load " << settings_file << " - No matching settings group for name " << settings_name << llendl;
+                        continue;
+                }
+                if(!gSettings[settings_name]->loadFromFile(full_settings_path))
+                {
+                        llwarns << "Cannot load " << full_settings_path << " - No settings found." << llendl;
+                }
+                else
+                {
+                        llinfos << "Loaded settings file " << full_settings_path << llendl;
+                }
+        }
+}
+
+std::string LLAppViewer::getSettingsFileName(const std::string& file)
+{
+        if(mSettingsFileList.has(file))
+        {
+                return mSettingsFileList[file].asString();
+        }
+        return std::string();
+}
+
 bool LLAppViewer::initConfiguration()
 {
-        // Ye olde parse_args()...
-        if(!doConfigFromCommandLine())
+        //Set up internal pointers      
+        gSettings[sGlobalSettingsName] = &gSavedSettings;
+        gSettings[sPerAccountSettingsName] = &gSavedPerAccountSettings;
+        gSettings[sCrashSettingsName] = &gCrashSettings;
+
+        //Load settings files list
+        std::string settings_file_list = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings_files.xml");
+        LLControlGroup settings_control;
+        llinfos << "Loading settings file list" << settings_file_list << llendl;
+        if (0 == settings_control.loadFromFile(settings_file_list))
+        {
+        llerrs << "Cannot load default configuration file " << settings_file_list << llendl;
+        }
+
+        mSettingsFileList = settings_control.getLLSD("Files");
+        
+        // The settings and command line parsing have a fragile
+        // order-of-operation:
+        // - load defaults from app_settings
+        // - set procedural settings values
+        // - read command line settings
+        // - selectively apply settings needed to load user settings.
+    // - load overrides from user_settings 
+        // - apply command line settings (to override the overrides)
+        // - load per account settings (happens in llstartup
+        
+        // - load defaults
+        loadSettingsFromDirectory(LL_PATH_APP_SETTINGS);
+
+        // - set procedural settings 
+        gSavedSettings.setString("ClientSettingsFile", 
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global")));
+
+        gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
+
+#ifndef         LL_RELEASE_FOR_DOWNLOAD
+        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
+        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
+#endif
+
+#if LL_WINDOWS
+        // Lists Japanese, Korean, and Chinese sanserif fonts available in
+        // Windows XP and Vista, as well as "Arial Unicode MS".
+        gSavedSettings.setString("FontSansSerifFallback",
+                                                         "MSGOTHIC.TTC;gulim.ttc;simhei.ttf;ArialUni.ttf");
+#elif LL_DARWIN
+        // This is a fairly complete Japanese font that ships with Mac OS X.
+        // The first filename is in UTF8, but it shows up in the font menu as "Hiragino Kaku Gothic Pro W3".
+        // The third filename is in UTF8, but it shows up in the font menu as "STHeiti Light"
+        gSavedSettings.setString("FontSansSerifFallback", 
+                                                         "\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 Pro W3.otf;\xE3\x83\x92\xE3\x83\xA9\xE3\x82\xAD\xE3\x82\x99\xE3\x83\x8E\xE8\xA7\x92\xE3\x82\xB3\xE3\x82\x99 ProN W3.otf;AppleGothic.dfont;AppleGothic.ttf;\xe5\x8d\x8e\xe6\x96\x87\xe7\xbb\x86\xe9\xbb\x91.ttf");
+#else
+        // 'unicode.ttf' doesn't exist, but hopefully an international
+        // user can take the hint and drop in their favourite local font.
+        gSavedSettings.setString("FontSansSerifFallback",       
+                                                         "unicode.ttf");
+#endif
+
+
+        // These are warnings that appear on the first experience of that condition.
+        // They are already set in the settings_default.xml file, but still need to be added to LLFirstUse
+        // for disable/reset ability
+        LLFirstUse::addConfigVariable("FirstBalanceIncrease");
+        LLFirstUse::addConfigVariable("FirstBalanceDecrease");
+        LLFirstUse::addConfigVariable("FirstSit");
+        LLFirstUse::addConfigVariable("FirstMap");
+        LLFirstUse::addConfigVariable("FirstGoTo");
+        LLFirstUse::addConfigVariable("FirstBuild");
+        LLFirstUse::addConfigVariable("FirstLeftClickNoHit");
+        LLFirstUse::addConfigVariable("FirstTeleport");
+        LLFirstUse::addConfigVariable("FirstOverrideKeys");
+        LLFirstUse::addConfigVariable("FirstAttach");
+        LLFirstUse::addConfigVariable("FirstAppearance");
+        LLFirstUse::addConfigVariable("FirstInventory");
+        LLFirstUse::addConfigVariable("FirstSandbox");
+        LLFirstUse::addConfigVariable("FirstFlexible");
+        LLFirstUse::addConfigVariable("FirstDebugMenus");
+        LLFirstUse::addConfigVariable("FirstStreamingMusic");
+        LLFirstUse::addConfigVariable("FirstStreamingVideo");
+        LLFirstUse::addConfigVariable("FirstSculptedPrim");
+        LLFirstUse::addConfigVariable("FirstVoice");
+        LLFirstUse::addConfigVariable("FirstMedia");
+                
+    //////
+    // *FIX:Mani - Find a way to remove the gUICtrlFactory and
+    // LLAlertDialog::parseAlerts dependecies on the being loaded
+    // *before* the user settings. Having to do this init here
+    // seems odd. 
+
+        // This is where gUICtrlFactory used to be instantiated with a new LLUICtrlFactory
+        // which needed to happen before calling parseAlerts below.
+        // TODO: That method is still dependant upon the base LLUICtrlFactory constructor being called
+        // which registers some callbacks so I'm leaving in a call to getInstance here to cause that to
+        // still happen. This needs to be cleaned up later when the base and derived classes
+        // are planned to be combined. -MG
+        LLUICtrlFactory::getInstance();
+        
+
+        // Pre-load alerts.xml to define the warnings settings (always loads from skins/xui/en-us/)
+        // Do this *before* loading the settings file
+        LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
+
+        // - read command line settings
+        LLControlGroupCLP clp;
+        std::string     cmd_line_config = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
+                                                                                                                  "cmd_line.xml");
+        clp.configure(cmd_line_config, &gSavedSettings);
+
+        if(!initParseCommandLine(clp))
         {
+                llwarns 
+                        << "Error parsing command line options. Command Line options ignored." 
+                        << llendl;
+
+                llinfos << "Command     line usage:\n" << clp << llendl;
+
+                std::ostringstream msg;
+                msg << "Second Life found an error parsing the command line. \n" 
+                        << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n"
+                        << "Error: " << clp.getErrorMessage();
+
+                OSMessageBox(
+                        msg.str().c_str(),
+                        NULL,
+                        OSMB_OK);
+
                 return false;
         }
         
+        // - selectively apply settings 
+
+        // If the user has specified a alternate settings file name.
+        // Load it now before loading the user_settings/settings.xml
+        if(clp.hasOption("settings"))
+        {
+                std::string     user_settings_filename = 
+                        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, 
+                                                                                   clp.getOption("settings")[0]);               
+                gSavedSettings.setString("ClientSettingsFile", user_settings_filename);
+                llinfos << "Using command line specified settings filename: " 
+                        << user_settings_filename << llendl;
+        }
+
+        // - load overrides from user_settings 
+        loadSettingsFromDirectory(LL_PATH_USER_SETTINGS);
+
+        // - apply command line settings 
+        clp.notify(); 
+
+        // Handle initialization from settings.
+        // Start up     the     debugging console before handling other options.
+        if (gSavedSettings.getBOOL("ShowConsoleWindow"))
+        {
+                initConsole();
+        }
+
+        if(clp.hasOption("help"))
+        {
+                std::ostringstream msg;
+                msg << "Command line usage:\n" << clp;
+                llinfos << msg.str() << llendl;
+
+                OSMessageBox(
+                        msg.str().c_str(),
+                        NULL,
+                        OSMB_OK);
+
+                return false;
+        }
+
+    //////////////////////////
+    // Apply settings...
+    if(clp.hasOption("setdefault"))
+    {
+        //const LLCommandLineParser::token_vector_t& setdefault = clp.getOption("setdefault");
+        //if(0x1 & setdefault.size())
+        //{
+        //    llwarns << "Invalid '--setdefault' parameter count." << llendl;
+        //}
+        //else
+        //{
+        //    LLCommandLineParser::token_vector_t::const_iterator itr = setdefault.begin();
+        //    for(; itr != setdefault.end(); ++itr)
+        //    {
+        //        const std::string& name = *itr;
+        //        const std::string& value = *(++itr);
+        //        LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
+        //        if(c)
+        //        {
+        //            c->setDefault(value);
+        //        }
+        //        else
+        //        {
+        //            llwarns << "'--setdefault' specified with unknown setting: '"
+        //                << name << "'." << llendl;
+        //        }
+        //    }
+        //}
+    }
+
+    if(clp.hasOption("set"))
+    {
+        const LLCommandLineParser::token_vector_t& set_values = clp.getOption("set");
+        if(0x1 & set_values.size())
+        {
+            llwarns << "Invalid '--set' parameter count." << llendl;
+        }
+        else
+        {
+            LLCommandLineParser::token_vector_t::const_iterator itr = set_values.begin();
+            for(; itr != set_values.end(); ++itr)
+            {
+                const std::string& name = *itr;
+                const std::string& value = *(++itr);
+                LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
+                if(c)
+                {
+                    c->setValue(value, false);
+                }
+                else
+                {
+                    llwarns << "'--set' specified with unknown setting: '"
+                        << name << "'." << llendl;
+                }
+            }
+        }
+    }
+
+    initGridChoice();
+
+        // If we have specified crash on startup, set the global so we'll trigger the crash at the right time
+        if(clp.hasOption("crashonstartup"))
+        {
+                gCrashOnStartup = TRUE;
+        }
+
+        // Handle slurl use. NOTE: Don't let SL-55321 reappear.
+
+    // *FIX: This init code should be made more robust to prevent 
+    // the issue SL-55321 from returning. One thought is to allow 
+    // only select options to be set from command line when a slurl 
+    // is specified. More work on the settings system is needed to 
+    // achieve this. For now...
+
+    // *NOTE:Mani The command line parser parses tokens and is 
+    // setup to bail after parsing the '--url' option or the 
+    // first option specified without a '--option' flag (or
+    // any other option that uses the 'last_option' setting - 
+    // see LLControlGroupCLP::configure())
+
+    // What can happen is that someone can use IE (or potentially 
+    // other browsers) and do the rough equivalent of command 
+    // injection and steal passwords. Phoenix. SL-55321
+    if(clp.hasOption("url"))
+    {
+        std::string slurl = clp.getOption("url")[0];
+        if (LLURLDispatcher::isSLURLCommand(slurl))
+        {
+                LLStartUp::sSLURLCommand = slurl;
+        }
+        else
+        {
+                LLURLSimString::setString(slurl);
+        }
+    }
+    else if(clp.hasOption("slurl"))
+    {
+        std::string slurl = clp.getOption("slurl")[0];
+        if(LLURLDispatcher::isSLURL(slurl))
+        {
+            if (LLURLDispatcher::isSLURLCommand(slurl))
+            {
+                    LLStartUp::sSLURLCommand = slurl;
+            }
+            else
+            {
+                    LLURLSimString::setString(slurl);
+            }
+        }
+    }
+
+    const LLControlVariable* loginuri = gSavedSettings.getControl("LoginURI");
+    if(loginuri && LLString::null != loginuri->getValue().asString())
+    {   
+        addLoginURI(loginuri->getValue().asString());
+    }
+
+    const LLControlVariable* helperuri = gSavedSettings.getControl("HelperURI");
+    if(helperuri && LLString::null != helperuri->getValue().asString())
+    {   
+        setHelperURI(helperuri->getValue().asString());
+    }
+
+    const LLControlVariable* skinfolder = gSavedSettings.getControl("SkinFolder");
+    if(skinfolder && LLString::null != skinfolder->getValue().asString())
+    {   
+        gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
+    }
+
+    mYieldTime = gSavedSettings.getS32("YieldTime");
+             
         // XUI:translate
         gSecondLife = "Second Life";
 
@@ -2091,28 +1850,15 @@ bool LLAppViewer::initConfiguration()
         LLSplashScreen::show();
         LLSplashScreen::update(splash_msg.str().c_str());
 
-        LLVolumeMgr::initClass();
+        //LLVolumeMgr::initClass();
+        LLVolumeMgr* volume_manager = new LLVolumeMgr();
+        volume_manager->useMutex();     // LLApp and LLMutex magic must be manually enabled
+        LLPrimitive::setVolumeManager(volume_manager);
 
-        // Initialize the feature manager
-        // The feature manager is responsible for determining what features
-        // are turned on/off in the app.
-        gFeatureManagerp = new LLFeatureManager;
+        // Note: this is where we used to initialize LLFeatureManager::getInstance()->.
 
         gStartTime = totalTime();
 
-        ////////////////////////////////////////
-        //
-        // Process ini files
-        //
-
-        // declare all possible setting variables
-        declare_settings();
-
-#if !LL_RELEASE_FOR_DOWNLOAD
-//      only write the defaults for non-release builds!
-        gSavedSettings.saveToFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings_default.xml").c_str(), FALSE);
-#endif
-
         //
         // Set the name of the window
         //
@@ -2125,33 +1871,34 @@ bool LLAppViewer::initConfiguration()
 #endif
         LLString::truncate(gWindowTitle, 255);
 
-        if (!gMultipleViewersOK)
+        //RN: if we received a URL, hand it off to the existing instance
+        // don't call anotherInstanceRunning() when doing URL handoff, as
+        // it relies on checking a marker file which will not work when running
+        // out of different directories
+        std::string slurl;
+        if (!LLStartUp::sSLURLCommand.empty())
+        {
+                slurl = LLStartUp::sSLURLCommand;
+        }
+        else if (LLURLSimString::parse())
+        {
+                slurl = LLURLSimString::getURL();
+        }
+        if (!slurl.empty())
+        {
+                if (send_url_to_other_instance(slurl))
+                {
+                        // successfully handed off URL to existing instance, exit
+                        return false;
+                }
+        }
+
+        if (!gSavedSettings.getBOOL("AllowMultipleViewers"))
         {
             //
             // Check for another instance of the app running
             //
-                //RN: if we received a URL, hand it off to the existing instance
-                // don't call anotherInstanceRunning() when doing URL handoff, as
-                // it relies on checking a marker file which will not work when running
-                // out of different directories
-                std::string slurl;
-                if (!LLStartUp::sSLURLCommand.empty())
-                {
-                        slurl = LLStartUp::sSLURLCommand;
-                }
-                else if (LLURLSimString::parse())
-                {
-                        slurl = LLURLSimString::getURL();
-                }
-                if (!slurl.empty())
-                {
-                        if (send_url_to_other_instance(slurl))
-                        {
-                                // successfully handed off URL to existing instance, exit
-                                return false;
-                        }
-                }
-                
+
                 mSecondInstance = anotherInstanceRunning();
                 
                 if (mSecondInstance)
@@ -2251,111 +1998,29 @@ bool LLAppViewer::initConfiguration()
                 
                 if (mSecondInstance)
                 {
-                        gDisableVoice = TRUE;
-                        /* Don't start another instance if using -multiple
-                        //RN: if we received a URL, hand it off to the existing instance
-                    if (LLURLSimString::parse())
-                    {
-                            LLURLSimString::send_to_other_instance();
-                                return 1;
+                        // This is the second instance of SL. Turn off voice support,
+                        // but make sure the setting is *not* persisted.
+                        LLControlVariable* disable_voice = gSavedSettings.getControl("CmdLineDisableVoice");
+                        if(disable_voice)
+                        {
+                                const BOOL DO_NOT_PERSIST = FALSE;
+                                disable_voice->setValue(LLSD(TRUE), DO_NOT_PERSIST);
                         }
-                        */
                 }
 
                 initMarkerFile();
         }
 
-        return true; // Config was successful.
-}
-
-bool LLAppViewer::doConfigFromCommandLine()
-{
-        // *FIX: This is what parse args used to do, minus the arg reading part.
-        // Now the arg parsing is handled by LLApp::parseCommandOptions() and this
-        // method need only interpret settings. Perhaps some day interested parties 
-        // can ask an app about a setting rather than have the app set 
-        // a gazzillion globals.
-        
-        /////////////////////////////////////////
-        //
-        // Process command line arguments
-        //
-        S32 args_result = 0;
-
-#if LL_DARWIN
+        // need to do this here - need to have initialized global settings first
+        LLString nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
+        if ( nextLoginLocation.length() )
         {
-                // On the Mac, read in arguments.txt (if it exists) and process it for additional arguments.
-                LLString args;
-                if(_read_file_into_string(args, "arguments.txt"))               /* Flawfinder: ignore*/
-                {
-                        // The arguments file exists.  
-                        // It should consist of command line arguments separated by newlines.
-                        // Split it into individual arguments and build a fake argv[] to pass to parse_args.
-                        std::vector<std::string> arglist;
-                        
-                        arglist.push_back("newview");
-                        
-                        llinfos << "Reading additional command line arguments from arguments.txt..." << llendl;
-                        
-                        typedef boost::tokenizer<boost::escaped_list_separator<char> > tokenizer;
-                        boost::escaped_list_separator<char> sep("\\", "\r\n ", "\"'");
-                        tokenizer tokens(args, sep);
-                        tokenizer::iterator token_iter;
-
-                        for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
-                        {
-                                // people can put their password in the file. :(
-                                // http://jira.secondlife.com/browse/SEC-42
-                                //llinfos << "argument: '" << (token_iter->c_str()) << "'" << llendl;
-                                
-                                arglist.push_back(*token_iter);
-                        }
-
-                        char **fakeargv = new char*[arglist.size()];
-                        int i;
-                        for(i=0; i < arglist.size(); i++)
-                                fakeargv[i] = const_cast<char*>(arglist[i].c_str());
-                                
-                        args_result = parse_args(arglist.size(), fakeargv);
-                        delete[] fakeargv;
-                }
-                
-                // Get the user's preferred language string based on the Mac OS localization mechanism.
-                // To add a new localization:
-                        // go to the "Resources" section of the project
-                        // get info on "language.txt"
-                        // in the "General" tab, click the "Add Localization" button
-                        // create a new localization for the language you're adding
-                        // set the contents of the new localization of the file to the string corresponding to our localization
-                        //   (i.e. "en-us", "ja", etc.  Use the existing ones as a guide.)
-                CFURLRef url = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("language"), CFSTR("txt"), NULL);
-                char path[MAX_PATH];
-                if(CFURLGetFileSystemRepresentation(url, false, (UInt8 *)path, sizeof(path)))
-                {
-                        LLString lang;
-                        if(_read_file_into_string(lang, path))          /* Flawfinder: ignore*/
-                        {
-                                gCommandLineForcedSettings["SystemLanguage"] = lang;
-                        }
-                }
-                CFRelease(url);
-        }
-#endif
-
-        int argc = gTempArgC;
-        char** argv = gTempArgV;
+                LLURLSimString::setString( nextLoginLocation.c_str() );
+        };
 
-        //
-        // Parse the command line arguments
-        //
-        args_result |= parse_args(argc, argv);
-        if (args_result)
-        {
-                removeMarkerFile();
-                return false;
-        }
+        gLastRunVersion = gSavedSettings.getString("LastRunVersion");
 
-        return true;
+        return true; // Config was successful.
 }
 
 bool LLAppViewer::initWindow()
@@ -2374,10 +2039,11 @@ bool LLAppViewer::initWindow()
         window_title_str[sizeof(window_title_str) - 1] = '\0';
 
         // always start windowed
+        BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
         gViewerWindow = new LLViewerWindow(window_title_str, "Second Life",
                 gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
                 gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
-                FALSE, gIgnorePixelDepth);
+                FALSE, ignorePixelDepth);
                 
         if (gSavedSettings.getBOOL("FullScreen"))
         {
@@ -2399,14 +2065,20 @@ bool LLAppViewer::initWindow()
 
                 // Set this flag in case we crash while initializing GL
                 gSavedSettings.setBOOL("RenderInitError", TRUE);
-                gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
         
                 gPipeline.init();
                 stop_glerror();
                 gViewerWindow->initGLDefaults();
 
                 gSavedSettings.setBOOL("RenderInitError", FALSE);
-                gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+                gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
+        }
+
+        //If we have a startup crash, it's usually near GL initialization, so simulate that.
+        if(gCrashOnStartup)
+        {
+                LLAppViewer::instance()->forceErrorLLError();
         }
 
         LLUI::sWindow = gViewerWindow->getWindow();
@@ -2414,11 +2086,6 @@ bool LLAppViewer::initWindow()
         LLAlertDialog::parseAlerts("alerts.xml");
         LLNotifyBox::parseNotify("notify.xml");
 
-        // *TODO - remove this when merging into release
-        // DON'T Clean up the feature manager lookup table - settings are needed
-        // for setting the graphics level.
-        //gFeatureManagerp->cleanupFeatureTables();
-
         // Show watch cursor
         gViewerWindow->setCursor(UI_CURSOR_WAIT);
 
@@ -2427,6 +2094,7 @@ bool LLAppViewer::initWindow()
 
         // show viewer window
         gViewerWindow->mWindow->show();
+
         
         return true;
 }
@@ -2455,6 +2123,7 @@ void LLAppViewer::cleanupSavedSettings()
         gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc);
                 
         gSavedSettings.setBOOL("AllowIdleAFK", gAllowIdleAFK);
+        gSavedSettings.setBOOL("AllowTapTapHoldRun", gAllowTapTapHoldRun);
         gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates);
         
         if (!gNoRender)
@@ -2462,7 +2131,7 @@ void LLAppViewer::cleanupSavedSettings()
                 if (gDebugView)
                 {
                         gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible());
-                        gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mStatViewp->getVisible());
+                        gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mFloaterStatsp->getVisible());
                 }
         }
 
@@ -2508,7 +2177,7 @@ void LLAppViewer::writeSystemInfo()
 {
         gDebugInfo["SLLog"] = LLError::logFileName();
 
-        gDebugInfo["ClientInfo"]["Name"] = gChannelName;
+        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2543,6 +2212,13 @@ void LLAppViewer::writeSystemInfo()
         llinfos << "OS info: " << getOSInfo() << llendl;
 }
 
+void LLAppViewer::handleSyncViewerCrash()
+{
+        LLAppViewer* pApp = LLAppViewer::instance();
+        // Call to pure virtual, handled by platform specific llappviewer instance.
+        pApp->handleSyncCrashTrace(); 
+}
+
 void LLAppViewer::handleViewerCrash()
 {
         LLAppViewer* pApp = LLAppViewer::instance();
@@ -2562,13 +2238,25 @@ void LLAppViewer::handleViewerCrash()
 
         //We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
         //to check against no matter what
-        gDebugInfo["ClientInfo"]["Name"] = gChannelName;
+        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
         gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( parcel && parcel->getMusicURL()[0])
+        {
+                gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
+        }       
+        if ( parcel && parcel->getMediaURL()[0])
+        {
+                gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
+        }
+        
         
-        gDebugInfo["SettingsFilename"] = gSettingsFileName;
+        gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName().c_str();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath().c_str();
@@ -2625,10 +2313,8 @@ void LLAppViewer::handleViewerCrash()
                 gMessageSystem->getCircuitInfo(gDebugInfo["CircuitInfo"]);
                 gMessageSystem->stopLogging();
         }
-        if (gWorldp)
-        {
-                gWorldp->getInfo(gDebugInfo);
-        }
+
+        LLWorld::getInstance()->getInfo(gDebugInfo);
 
         // Close the debug file
         pApp->closeDebug();
@@ -2644,7 +2330,7 @@ void LLAppViewer::handleViewerCrash()
                 pApp->removeMarkerFile(false);
         }
         
-        // Call to pure virtual, handled by platform specifc llappviewer instance.
+        // Call to pure virtual, handled by platform specific llappviewer instance.
         pApp->handleCrashReporting(); 
 
         return;
@@ -2740,7 +2426,11 @@ void LLAppViewer::initMarkerFile()
         ll_apr_file_remove(error_marker_file);
         
         //Freeze case checks
-        if(anotherInstanceRunning()) return;
+        if(anotherInstanceRunning()) 
+        {
+                return;
+        }
+        
         fMarker = ll_apr_file_open(mMarkerFileName, LL_APR_RB);         
         if (fMarker != NULL)
         {
@@ -2804,13 +2494,10 @@ void LLAppViewer::requestQuit()
                 return;
         }
 
-        if (gHUDManager)
-        {
-                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-                effectp->setPositionGlobal(gAgent.getPositionGlobal());
-                effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-                gHUDManager->sendEffects();
-        }
+        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+        effectp->setPositionGlobal(gAgent.getPositionGlobal());
+        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
+        LLHUDManager::getInstance()->sendEffects();
 
         // Attempt to close all floaters that might be
         // editing things.
@@ -2952,7 +2639,7 @@ bool LLAppViewer::initCache()
         char static_vfs_index_file[LL_MAX_PATH];        // Flawfinder: ignore
         char static_vfs_data_file[LL_MAX_PATH]; // Flawfinder: ignore
 
-        if (gMultipleViewersOK)
+        if (gSavedSettings.getBOOL("AllowMultipleViewers"))
         {
                 // don't mess with renaming the VFS in this case
                 new_salt = old_salt;
@@ -3143,7 +2830,25 @@ const std::string& LLAppViewer::getHelperURI() const
 
 void LLAppViewer::addLoginURI(const std::string& uri)
 {
+        // *NOTE:Mani - login uri trumps the --grid (gGridChoice) setting.
+        // Update gGridChoice to reflect the loginURI setting.
     gLoginURIs.push_back(uri);
+        
+        const std::string& top_uri = getLoginURIs()[0];
+        int i = 0;
+        for(; i < GRID_INFO_COUNT; ++i)
+        {
+                if(top_uri == gGridInfo[i].mLoginURI)
+                {
+                        gGridChoice = (EGridInfo)i;
+                        break;
+                }
+        }
+
+        if(GRID_INFO_COUNT == i)
+        {
+                gGridChoice = GRID_INFO_OTHER;
+        }
 }
 
 void LLAppViewer::setHelperURI(const std::string& uri)
@@ -3151,17 +2856,6 @@ void LLAppViewer::setHelperURI(const std::string& uri)
     gHelperURI = uri;
 }
 
-void LLAppViewer::setLoginPage(const std::string& login_page)
-{
-        gLoginPage = login_page;
-}
-
-const std::string& LLAppViewer::getLoginPage()
-{
-        return gLoginPage;
-}
-
-
 // Callback from a dialog indicating user was logged out.  
 void finish_disconnect(S32 option, void* userdata)
 {
@@ -3224,6 +2918,7 @@ void LLAppViewer::badNetworkHandler()
         // Generates the minidump.
         LLWinDebug::handleException(NULL);
 #endif
+        LLAppViewer::handleSyncViewerCrash();
         LLAppViewer::handleViewerCrash();
 
         std::ostringstream message;
@@ -3257,7 +2952,8 @@ void LLAppViewer::saveFinalSnapshot()
                 LLString snap_filename = gDirUtilp->getLindenUserDir();
                 snap_filename += gDirUtilp->getDirDelimiter();
                 snap_filename += SCREEN_LAST_FILENAME;
-                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidth(), gViewerWindow->getWindowHeight(), FALSE, TRUE);
+                // use full pixel dimensions of viewer window (not post-scale dimensions)
+                gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight(), FALSE, TRUE);
                 mSavedFinalSnapshot = TRUE;
         }
 }
@@ -3299,7 +2995,10 @@ void LLAppViewer::saveNameCache()
 
 bool LLAppViewer::isInProductionGrid()
 {
-    return (GRID_INFO_AGNI == gGridChoice);
+        // *NOTE:Mani This used to compare GRID_INFO_AGNI to gGridChoice,
+        // but it seems that loginURI trumps that.
+        const std::string& loginURI = getLoginURIs()[0];
+        return (loginURI == gGridInfo[GRID_INFO_AGNI].mLoginURI);
 }
 
 
@@ -3330,8 +3029,6 @@ void LLAppViewer::idle()
         // Update frame timers
         static LLTimer idle_timer;
 
-        LLControlBase::updateAllListeners();
-
         LLFrameTimer::updateFrameTime();
         LLEventTimer::updateClass();
         LLCriticalDamp::updateInterpolants();
@@ -3352,9 +3049,10 @@ void LLAppViewer::idle()
         // Smoothly weight toward current frame
         gFPSClamped = (frame_rate_clamped + (4.f * gFPSClamped)) / 5.f;
 
-        if (gQuitAfterSeconds > 0.f)
+        F32 qas = gSavedSettings.getF32("QuitAfterSeconds");
+        if (qas > 0.f)
         {
-                if (gRenderStartTime.getElapsedTimeF32() > gQuitAfterSeconds)
+                if (gRenderStartTime.getElapsedTimeF32() > qas)
                 {
                         LLAppViewer::instance()->forceQuit();
                 }
@@ -3385,7 +3083,7 @@ void LLAppViewer::idle()
         {
                 LLFastTimer t(LLFastTimer::FTM_NETWORK);
                 // Update spaceserver timeinfo
-            gWorldp->setSpaceTimeUSec(gWorldp->getSpaceTimeUSec() + (U32)(dt_raw * SEC_TO_MICROSEC));
+            LLWorld::getInstance()->setSpaceTimeUSec(LLWorld::getInstance()->getSpaceTimeUSec() + (U32)(dt_raw * SEC_TO_MICROSEC));
     
     
             //////////////////////////////////////
@@ -3393,7 +3091,7 @@ void LLAppViewer::idle()
             // Update simulator agent state
             //
 
-                if (gRotateRight)
+                if (gSavedSettings.getBOOL("RotateRight"))
                 {
                         gAgent.moveYaw(-1.f);
                 }
@@ -3519,7 +3217,7 @@ void LLAppViewer::idle()
         {
                 // After agent and camera moved, figure out if we need to
                 // deselect objects.
-                gSelectMgr->deselectAllIfTooFar();
+                LLSelectMgr::getInstance()->deselectAllIfTooFar();
 
         }
 
@@ -3536,7 +3234,7 @@ void LLAppViewer::idle()
                 
         if (!(logoutRequestSent() && hasSavedFinalSnapshot()))
                 {
-                        gObjectList.update(gAgent, *gWorldp);
+                        gObjectList.update(gAgent, *LLWorld::getInstance());
                 }
         }
         
@@ -3568,9 +3266,9 @@ void LLAppViewer::idle()
 
         {
                 gFrameStats.start(LLFrameStats::UPDATE_EFFECTS);
-                gSelectMgr->updateEffects();
-                gHUDManager->cleanupEffects();
-                gHUDManager->sendEffects();
+                LLSelectMgr::getInstance()->updateEffects();
+                LLHUDManager::getInstance()->cleanupEffects();
+                LLHUDManager::getInstance()->sendEffects();
         }
 
         stop_glerror();
@@ -3590,21 +3288,20 @@ void LLAppViewer::idle()
         // Update surfaces, and surface textures as well.
         //
 
-        gWorldp->updateVisibilities();
+        LLWorld::getInstance()->updateVisibilities();
         {
                 const F32 max_region_update_time = .001f; // 1ms
                 LLFastTimer t(LLFastTimer::FTM_REGION_UPDATE);
-                gWorldp->updateRegions(max_region_update_time);
+                LLWorld::getInstance()->updateRegions(max_region_update_time);
         }
         
         /////////////////////////
         //
         // Update weather effects
         //
-
         if (!gNoRender)
         {
-                gWorldp->updateClouds(gFrameDTClamped);
+                LLWorld::getInstance()->updateClouds(gFrameDTClamped);
                 gSky.propagateHeavenlyBodies(gFrameDTClamped);                          // moves sun, moon, and planets
 
                 // Update wind vector 
@@ -3612,7 +3309,7 @@ void LLAppViewer::idle()
                 static LLVector3 average_wind;
 
                 LLViewerRegion *regionp;
-                regionp = gWorldp->resolveRegionGlobal(wind_position_region, gAgent.getPositionGlobal());       // puts agent's local coords into wind_position 
+                regionp = LLWorld::getInstance()->resolveRegionGlobal(wind_position_region, gAgent.getPositionGlobal());        // puts agent's local coords into wind_position 
                 if (regionp)
                 {
                         gWindVec = regionp->mWind.getVelocity(wind_position_region);
@@ -3635,27 +3332,6 @@ void LLAppViewer::idle()
         
         //////////////////////////////////////
         //
-        // Update images, using the image stats generated during object update/culling
-        //
-        // Can put objects onto the retextured list.
-        //
-        gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
-
-        {
-                LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
-                
-                LLViewerImage::updateClass(gCamera->getVelocityStat()->getMean(),
-                                                                        gCamera->getAngularVelocityStat()->getMean());
-
-                gBumpImageList.updateImages();  // must be called before gImageList version so that it's textures are thrown out first.
-
-                const F32 max_image_decode_time = llmin(0.005f, 0.005f*10.f*gFrameIntervalSeconds); // 50 ms/second decode time (no more than 5ms/frame)
-                gImageList.updateImages(max_image_decode_time);
-                stop_glerror();
-        }
-
-        //////////////////////////////////////
-        //
         // Sort and cull in the new renderer are moved to pipeline.cpp
         // Here, particles are updated and drawables are moved.
         //
@@ -3667,17 +3343,22 @@ void LLAppViewer::idle()
                 gPipeline.updateMove();
 
                 gFrameStats.start(LLFrameStats::UPDATE_PARTICLES);
-                gWorldp->updateParticles();
+                LLWorld::getInstance()->updateParticles();
         }
         stop_glerror();
 
-        if (!LLViewerJoystick::sOverrideCamera)
+        if (LLViewerJoystick::getInstance()->getOverrideCamera())
         {
-                gAgent.updateCamera();
+                LLViewerJoystick::getInstance()->moveFlycam();
         }
         else
         {
-                LLViewerJoystick::updateCamera();
+                if (LLToolMgr::getInstance()->inBuildMode())
+                {
+                        LLViewerJoystick::getInstance()->moveObjects();
+                }
+
+                gAgent.updateCamera();
         }
 
         // objects and camera should be in sync, do LOD calculations now
@@ -3948,9 +3629,9 @@ void LLAppViewer::disconnectViewer()
                 }
         }
 
-        if (gSelectMgr)
+        if (LLSelectMgr::getInstance())
         {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
         }
 
         if (!gNoRender)
@@ -3971,9 +3652,9 @@ void LLAppViewer::disconnectViewer()
         // Also writes cached agent settings to gSavedSettings
         gAgent.cleanup();
 
-        gObjectList.destroy();
-        delete gWorldp;
-        gWorldp = NULL;
+        // This is where we used to call gObjectList.destroy() and then delete gWorldp.
+        // Now we just ask the LLWorld singleton to cleanly shut down.
+        LLWorld::getInstance()->destroyClass();
 
         cleanup_xfer_manager();
         gDisconnected = TRUE;