Merge with tip of viewer development

10 files changed, 3264 insertions, 3262 deletions

diff --git a/.hgtags b/.hgtags
index 8fa56c75b7..812f1deff2 100644
--- a/.hgtags
+++ b/.hgtags
@@ -71,3 +71,7 @@ b723921b5c711bd24dbe77dc76ef488b544dac78 2.5.0-release
 b723921b5c711bd24dbe77dc76ef488b544dac78 DRTVWR-31_2.5.0-release
 92e58e51776a4f8c29069b1a62ff21454d2085f0 2.6.0-start
 63a6aedfce785a6c760377bf685b2dae616797d2 2.5.1-start
+4dede9ae1ec74d41f6887719f6f1de7340d8578d 2.5.1-release
+4dede9ae1ec74d41f6887719f6f1de7340d8578d DRTVWR-37_2.5.1-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 DRTVWR-38_2.5.2-release
+b53a0576eec80614d7767ed72b40ed67aeff27c9 2.5.2-release
diff --git a/BuildParams b/BuildParams
index 8e036ab56b..934bed6c5f 100644
--- a/BuildParams
+++ b/BuildParams
@@ -57,6 +57,12 @@ viewer-release.build_debug_release_separately = true
 viewer-release.build_viewer_update_version_manager = true
 viewer-release.release-viewer.jira = DRTVWR-13
 
+viewer-pre-release.viewer_channel = "Second Life Release"
+viewer-pre-release.login_channel = "Second Life Release"
+viewer-pre-release.build_debug_release_separately = true
+viewer-pre-release.build_viewer_update_version_manager = true
+#viewer-pre-release.release-viewer.jira = DRTVWR-13
+
 # ========================================
 # aimee
 # ========================================
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e94acb566a..4c2a836b4c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -84,10 +84,12 @@ Aleric Inglewood
 	VWR-24315
 	VWR-24317
 	VWR-24320
-    VWR-24321
+	VWR-24321
+	VWR-24337
  	VWR-24354
 	VWR-24366
 	VWR-24519
+	VWR-24520
 	SNOW-84
 	SNOW-477
 	SNOW-744
@@ -237,6 +239,7 @@ Coaldust Numbers
     VWR-1095
 Cron Stardust
 	VWR-10579
+	VWR-25120
 Cypren Christenson
 	STORM-417
 Dale Glass
@@ -406,7 +409,9 @@ Jonathan Yap
 	STORM-1040
 	VWR-17801
 	VWR-24347
+	STORM-975
 	STORM-990
+	STORM-1020
 Kage Pixel
 	VWR-11
 Ken March
@@ -423,6 +428,7 @@ Kitty Barnett
 	STORM-288
 	STORM-799
 	STORM-800
+	STORM-1001
     VWR-24217
 Kunnis Basiat
 	VWR-82
diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake
index c747ec32a2..4bf5f5cb73 100644
--- a/indra/cmake/FindLLQtWebkit.cmake
+++ b/indra/cmake/FindLLQtWebkit.cmake
@@ -22,9 +22,9 @@ if (PKG_CONFIG_FOUND)
     else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
         set(_PACKAGE_ARGS libllqtwebkit)
     endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION)
-    if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8")
+    if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.2")
       # As virtually nobody will have a pkg-config file for this, do this check always quiet.
-      # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'.
+      # Unfortunately cmake 2.8.2 or higher is required for pkg_check_modules to have a 'QUIET'.
       set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET)
     endif ()
     pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS})
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 15e3ffe1da..3838b2b16c 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -29,7 +29,7 @@
 
 const S32 LL_VERSION_MAJOR = 2;
 const S32 LL_VERSION_MINOR = 5;
-const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_PATCH = 3;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Developer";
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 861bde5c89..34eff17519 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -423,24 +423,10 @@ S32 LLTextureEntry::setBumpShinyFullbright(U8 bump)
 
 S32 LLTextureEntry::setMediaTexGen(U8 media)
 {
-	if (mMediaFlags != media)
-	{
-		mMediaFlags = media;
-
-		// Special code for media handling
-		if( hasMedia() && mMediaEntry == NULL)
-		{
-			mMediaEntry = new LLMediaEntry;
-		}
-        else if ( ! hasMedia() && mMediaEntry != NULL)
-        {
-            delete mMediaEntry;
-            mMediaEntry = NULL;
-        }
-
-		return TEM_CHANGE_MEDIA;
-	}
-	return TEM_CHANGE_NONE;
+	S32 result = TEM_CHANGE_NONE;
+	result |= setTexGen(media & TEM_TEX_GEN_MASK);
+	result |= setMediaFlags(media & TEM_MEDIA_MASK);
+	return result;
 }
 
 S32 LLTextureEntry::setBumpmap(U8 bump)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 57314f14a8..45159de66e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1,3228 +1,3229 @@
-/** 
- * @file llstartup.cpp
- * @brief startup routines.
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llstartup.h"
-
-#if LL_WINDOWS
-#	include <process.h>		// _spawnl()
-#else
-#	include <sys/stat.h>		// mkdir()
-#endif
-
-#include "llviewermedia_streamingaudio.h"
-#include "llaudioengine.h"
-
-#ifdef LL_FMOD
-# include "llaudioengine_fmod.h"
-#endif
-
-#ifdef LL_OPENAL
-#include "llaudioengine_openal.h"
-#endif
-
-#include "llares.h"
-#include "llavatarnamecache.h"
-#include "lllandmark.h"
-#include "llcachename.h"
-#include "lldir.h"
-#include "llerrorcontrol.h"
-#include "llfloaterreg.h"
-#include "llfocusmgr.h"
-#include "llhttpsender.h"
-#include "llimfloater.h"
-#include "lllocationhistory.h"
-#include "llimageworker.h"
-
-#include "llloginflags.h"
-#include "llmd5.h"
-#include "llmemorystream.h"
-#include "llmessageconfig.h"
-#include "llmoveview.h"
-#include "llnearbychat.h"
-#include "llnotifications.h"
-#include "llnotificationsutil.h"
-#include "llteleporthistory.h"
-#include "llregionhandle.h"
-#include "llsd.h"
-#include "llsdserialize.h"
-#include "llsdutil_math.h"
-#include "llsecondlifeurls.h"
-#include "llstring.h"
-#include "lluserrelations.h"
-#include "llversioninfo.h"
-#include "llviewercontrol.h"
-#include "llvfs.h"
-#include "llxorcipher.h"	// saved password, MAC address
-#include "llwindow.h"
-#include "imageids.h"
-#include "message.h"
-#include "v3math.h"
-
-#include "llagent.h"
-#include "llagentcamera.h"
-#include "llagentpicksinfo.h"
-#include "llagentwearables.h"
-#include "llagentpilot.h"
-#include "llfloateravatarpicker.h"
-#include "llcallbacklist.h"
-#include "llcallingcard.h"
-#include "llconsole.h"
-#include "llcontainerview.h"
-#include "lldebugview.h"
-#include "lldrawable.h"
-#include "lleventnotifier.h"
-#include "llface.h"
-#include "llfeaturemanager.h"
-//#include "llfirstuse.h"
-#include "llfloaterhud.h"
-#include "llfloaterland.h"
-#include "llfloaterpreference.h"
-#include "llfloatertopobjects.h"
-#include "llfloaterworldmap.h"
-#include "llgesturemgr.h"
-#include "llgroupmgr.h"
-#include "llhudeffecttrail.h"
-#include "llhudmanager.h"
-#include "llhttpclient.h"
-#include "llimagebmp.h"
-#include "llinventorybridge.h"
-#include "llinventorymodel.h"
-#include "llinventorymodelbackgroundfetch.h"
-#include "llkeyboard.h"
-#include "llloginhandler.h"			// gLoginHandler, SLURL support
-#include "lllogininstance.h" // Host the login module.
-#include "llpanellogin.h"
-#include "llmutelist.h"
-#include "llavatarpropertiesprocessor.h"
-#include "llpanelclassified.h"
-#include "llpanelpick.h"
-#include "llpanelgrouplandmoney.h"
-#include "llpanelgroupnotices.h"
-#include "llpreview.h"
-#include "llpreviewscript.h"
-#include "llproductinforequest.h"
-#include "llsecondlifeurls.h"
-#include "llselectmgr.h"
-#include "llsky.h"
-#include "llsidetray.h"
-#include "llstatview.h"
-#include "llstatusbar.h"		// sendMoneyBalanceRequest(), owns L$ balance
-#include "llsurface.h"
-#include "lltexturecache.h"
-#include "lltexturefetch.h"
-#include "lltoolmgr.h"
-#include "lltrans.h"
-#include "llui.h"
-#include "llurldispatcher.h"
-#include "llurlentry.h"
-#include "llslurl.h"
-#include "llurlhistory.h"
-#include "llurlwhitelist.h"
-#include "llvieweraudio.h"
-#include "llviewerassetstorage.h"
-#include "llviewercamera.h"
-#include "llviewerdisplay.h"
-#include "llviewergenericmessage.h"
-#include "llviewergesture.h"
-#include "llviewertexturelist.h"
-#include "llviewermedia.h"
-#include "llviewermenu.h"
-#include "llviewermessage.h"
-#include "llviewernetwork.h"
-#include "llviewerobjectlist.h"
-#include "llviewerparcelmedia.h"
-#include "llviewerparcelmgr.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "llviewerthrottle.h"
-#include "llviewerwindow.h"
-#include "llvoavatar.h"
-#include "llvoavatarself.h"
-#include "llvoclouds.h"
-#include "llweb.h"
-#include "llworld.h"
-#include "llworldmapmessage.h"
-#include "llxfermanager.h"
-#include "pipeline.h"
-#include "llappviewer.h"
-#include "llfasttimerview.h"
-#include "llfloatermap.h"
-#include "llweb.h"
-#include "llvoiceclient.h"
-#include "llnamelistctrl.h"
-#include "llnamebox.h"
-#include "llnameeditor.h"
-#include "llpostprocess.h"
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-#include "llagentlanguage.h"
-#include "llwearable.h"
-#include "llinventorybridge.h"
-#include "llappearancemgr.h"
-#include "llavatariconctrl.h"
-#include "llvoicechannel.h"
-
-#include "lllogin.h"
-#include "llevents.h"
-#include "llstartuplistener.h"
-
-#if LL_WINDOWS
-#include "lldxhardware.h"
-#endif
-
-//
-// exported globals
-//
-bool gAgentMovementCompleted = false;
-S32  gMaxAgentGroups;
-
-std::string SCREEN_HOME_FILENAME = "screen_home.bmp";
-std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
-
-LLPointer<LLViewerTexture> gStartTexture;
-
-//
-// Imported globals
-//
-extern S32 gStartImageWidth;
-extern S32 gStartImageHeight;
-
-//
-// local globals
-//
-static bool gGotUseCircuitCodeAck = false;
-static std::string sInitialOutfit;
-static std::string sInitialOutfitGender;	// "male" or "female"
-static boost::signals2::connection sWearablesLoadedCon;
-
-static bool gUseCircuitCallbackCalled = false;
-
-EStartupState LLStartUp::gStartupState = STATE_FIRST;
-LLSLURL LLStartUp::sStartSLURL;
-
-static LLPointer<LLCredential> gUserCredential;
-static std::string gDisplayName;
-static BOOL gRememberPassword = TRUE;     
-
-static U64 gFirstSimHandle = 0;
-static LLHost gFirstSim;
-static std::string gFirstSimSeedCap;
-static LLVector3 gAgentStartLookAt(1.0f, 0.f, 0.f);
-static std::string gAgentStartLocation = "safe";
-static bool mLoginStatePastUI = false;
-
-
-boost::scoped_ptr<LLEventPump> LLStartUp::sStateWatcher(new LLEventStream("StartupState"));
-boost::scoped_ptr<LLStartupListener> LLStartUp::sListener(new LLStartupListener());
-
-//
-// local function declaration
-//
-
-void login_show();
-void login_callback(S32 option, void* userdata);
-void show_first_run_dialog();
-bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);
-void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);
-bool login_alert_status(const LLSD& notification, const LLSD& response);
-void login_packet_failed(void**, S32 result);
-void use_circuit_callback(void**, S32 result);
-void register_viewer_callbacks(LLMessageSystem* msg);
-void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32);
-bool callback_choose_gender(const LLSD& notification, const LLSD& response);
-void init_start_screen(S32 location_id);
-void release_start_screen();
-void reset_login();
-LLSD transform_cert_args(LLPointer<LLCertificate> cert);
-void general_cert_done(const LLSD& notification, const LLSD& response);
-void trust_cert_done(const LLSD& notification, const LLSD& response);
-void apply_udp_blacklist(const std::string& csv);
-bool process_login_success_response();
-void transition_back_to_login_panel(const std::string& emsg);
-
-void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)
-{
-	LLNameBox::refreshAll(id, full_name, is_group);
-	LLNameEditor::refreshAll(id, full_name, is_group);
-	
-	// TODO: Actually be intelligent about the refresh.
-	// For now, just brute force refresh the dialogs.
-	dialog_refresh_all();
-}
-
-//
-// exported functionality
-//
-
-//
-// local classes
-//
-
-namespace
-{
-	class LLNullHTTPSender : public LLHTTPSender
-	{
-		virtual void send(const LLHost& host, 
-						  const std::string& message, const LLSD& body, 
-						  LLHTTPClient::ResponderPtr response) const
-		{
-			LL_WARNS("AppInit") << " attemped to send " << message << " to " << host
-					<< " with null sender" << LL_ENDL;
-		}
-	};
-}
-
-void update_texture_fetch()
-{
-	LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread
-	LLAppViewer::getImageDecodeThread()->update(1); // unpauses the image thread
-	LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
-	gTextureList.updateImages(0.10f);
-}
-
-// Returns false to skip other idle processing. Should only return
-// true when all initialization done.
-bool idle_startup()
-{
-	LLMemType mt1(LLMemType::MTYPE_STARTUP);
-	
-	const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");
-	static LLTimer timeout;
-	static S32 timeout_count = 0;
-
-	static LLTimer login_time;
-
-	// until this is encapsulated, this little hack for the
-	// auth/transform loop will do.
-	static F32 progress = 0.10f;
-
-	static std::string auth_desc;
-	static std::string auth_message;
-
-	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);
-	static LLVector3 agent_start_position_region(10.f, 10.f, 10.f);		// default for when no space server
-
-	// last location by default
-	static S32  agent_location_id = START_LOCATION_ID_LAST;
-	static S32  location_which = START_LOCATION_ID_LAST;
-
-	static bool show_connect_box = true;
-
-	//static bool stipend_since_login = false;
-
-	// HACK: These are things from the main loop that usually aren't done
-	// until initialization is complete, but need to be done here for things
-	// to work.
-	gIdleCallbacks.callFunctions();
-	gViewerWindow->updateUI();
-	LLMortician::updateClass();
-
-	const std::string delims (" ");
-	std::string system;
-	int begIdx, endIdx;
-	std::string osString = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
-
-	begIdx = osString.find_first_not_of (delims);
-	endIdx = osString.find_first_of (delims, begIdx);
-	system = osString.substr (begIdx, endIdx - begIdx);
-	system += "Locale";
-
-	LLStringUtil::setLocale (LLTrans::getString(system));
-
-	if (!gNoRender)
-	{
-		//note: Removing this line will cause incorrect button size in the login screen. -- bao.
-		gTextureList.updateImages(0.01f) ;
-	}
-
-	if ( STATE_FIRST == LLStartUp::getStartupState() )
-	{
-		gViewerWindow->showCursor(); 
-		gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
-
-		/////////////////////////////////////////////////
-		//
-		// Initialize stuff that doesn't need data from simulators
-		//
-
-		if (LLFeatureManager::getInstance()->isSafe())
-		{
-			LLNotificationsUtil::add("DisplaySetToSafe");
-		}
-		else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) &&
-				 (gSavedSettings.getS32("LastFeatureVersion") != 0))
-		{
-			LLNotificationsUtil::add("DisplaySetToRecommended");
-		}
-		else if ((gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) &&
-				 (gSavedSettings.getS32("LastGPUClass") != -1))
-		{
-			LLNotificationsUtil::add("DisplaySetToRecommended");
-		}
-		else if (!gViewerWindow->getInitAlert().empty())
-		{
-			LLNotificationsUtil::add(gViewerWindow->getInitAlert());
-		}
-			
-		gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());
-		gSavedSettings.setS32("LastGPUClass", LLFeatureManager::getInstance()->getGPUClass());
-
-		// load dynamic GPU/feature tables from website (S3)
-		LLFeatureManager::getInstance()->fetchHTTPTables();
-		
-		std::string xml_file = LLUI::locateSkin("xui_version.xml");
-		LLXMLNodePtr root;
-		bool xml_ok = false;
-		if (LLXMLNode::parseFile(xml_file, root, NULL))
-		{
-			if( (root->hasName("xui_version") ) )
-			{
-				std::string value = root->getValue();
-				F32 version = 0.0f;
-				LLStringUtil::convertToF32(value, version);
-				if (version >= 1.0f)
-				{
-					xml_ok = true;
-				}
-			}
-		}
-		if (!xml_ok)
-		{
-			// If XML is bad, there's a good possibility that notifications.xml is ALSO bad.
-			// If that's so, then we'll get a fatal error on attempting to load it, 
-			// which will display a nontranslatable error message that says so.
-			// Otherwise, we'll display a reasonable error message that IS translatable.
-			LLAppViewer::instance()->earlyExit("BadInstallation");
-		}
-		//
-		// Statistics stuff
-		//
-
-		// Load autopilot and stats stuff
-		gAgentPilot.load(gSavedSettings.getString("StatsPilotFile"));
-
-		//gErrorStream.setTime(gSavedSettings.getBOOL("LogTimestamps"));
-
-		// Load the throttle settings
-		gViewerThrottle.load();
-
-		if (ll_init_ares() == NULL || !gAres->isInitialized())
-		{
-			std::string diagnostic = "Could not start address resolution system";
-			LL_WARNS("AppInit") << diagnostic << LL_ENDL;
-			LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().with("DIAGNOSTIC", diagnostic));
-		}
-		
-		//
-		// Initialize messaging system
-		//
-		LL_DEBUGS("AppInit") << "Initializing messaging system..." << LL_ENDL;
-
-		std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg");
-
-		LLFILE* found_template = NULL;
-		found_template = LLFile::fopen(message_template_path, "r");		/* Flawfinder: ignore */
-		
-		#if LL_WINDOWS
-			// On the windows dev builds, unpackaged, the message_template.msg 
-			// file will be located in:
-			// build-vc**/newview/<config>/app_settings
-			if (!found_template)
-			{
-				message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");
-				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
-			}	
-		#elif LL_DARWIN
-			// On Mac dev builds, message_template.msg lives in:
-			// indra/build-*/newview/<config>/Second Life/Contents/Resources/app_settings
-			if (!found_template)
-			{
-				message_template_path =
-					gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE,
-												   "../Resources/app_settings",
-												   "message_template.msg");
-				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */
-			}		
-		#endif
-
-		if (found_template)
-		{
-			fclose(found_template);
-
-			U32 port = gSavedSettings.getU32("UserConnectionPort");
-
-			if ((NET_USE_OS_ASSIGNED_PORT == port) &&   // if nothing specified on command line (-port)
-			    (gSavedSettings.getBOOL("ConnectionPortEnabled")))
-			  {
-			    port = gSavedSettings.getU32("ConnectionPort");
-			  }
-
-			LLHTTPSender::setDefaultSender(new LLNullHTTPSender());
-
-			// TODO parameterize 
-			const F32 circuit_heartbeat_interval = 5;
-			const F32 circuit_timeout = 100;
-
-			const LLUseCircuitCodeResponder* responder = NULL;
-			bool failure_is_fatal = true;
-			
-			if(!start_messaging_system(
-				   message_template_path,
-				   port,
-				   LLVersionInfo::getMajor(),
-				   LLVersionInfo::getMinor(),
-				   LLVersionInfo::getPatch(),
-				   FALSE,
-				   std::string(),
-				   responder,
-				   failure_is_fatal,
-				   circuit_heartbeat_interval,
-				   circuit_timeout))
-			{
-				std::string diagnostic = llformat(" Error: %d", gMessageSystem->getErrorCode());
-				LL_WARNS("AppInit") << diagnostic << LL_ENDL;
-				LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().with("DIAGNOSTIC", diagnostic));
-			}
-
-			#if LL_WINDOWS
-				// On the windows dev builds, unpackaged, the message.xml file will 
-				// be located in indra/build-vc**/newview/<config>/app_settings.
-				std::string message_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message.xml");
-							
-				if (!LLFile::isfile(message_path.c_str())) 
-				{
-					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", ""));
-				}
-				else
-				{
-					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
-				}
-			#else			
-				LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
-			#endif
-
-		}
-		else
-		{
-			LLAppViewer::instance()->earlyExit("MessageTemplateNotFound", LLSD().with("PATH", message_template_path));
-		}
-
-		if(gMessageSystem && gMessageSystem->isOK())
-		{
-			// Initialize all of the callbacks in case of bad message
-			// system data
-			LLMessageSystem* msg = gMessageSystem;
-			msg->setExceptionFunc(MX_UNREGISTERED_MESSAGE,
-								  invalid_message_callback,
-								  NULL);
-			msg->setExceptionFunc(MX_PACKET_TOO_SHORT,
-								  invalid_message_callback,
-								  NULL);
-
-			// running off end of a packet is now valid in the case
-			// when a reader has a newer message template than
-			// the sender
-			/*msg->setExceptionFunc(MX_RAN_OFF_END_OF_PACKET,
-								  invalid_message_callback,
-								  NULL);*/
-			msg->setExceptionFunc(MX_WROTE_PAST_BUFFER_SIZE,
-								  invalid_message_callback,
-								  NULL);
-
-			if (gSavedSettings.getBOOL("LogMessages"))
-			{
-				LL_DEBUGS("AppInit") << "Message logging activated!" << LL_ENDL;
-				msg->startLogging();
-			}
-
-			// start the xfer system. by default, choke the downloads
-			// a lot...
-			const S32 VIEWER_MAX_XFER = 3;
-			start_xfer_manager(gVFS);
-			gXferManager->setMaxIncomingXfers(VIEWER_MAX_XFER);
-			F32 xfer_throttle_bps = gSavedSettings.getF32("XferThrottle");
-			if (xfer_throttle_bps > 1.f)
-			{
-				gXferManager->setUseAckThrottling(TRUE);
-				gXferManager->setAckThrottleBPS(xfer_throttle_bps);
-			}
-			gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS, gStaticVFS);
-
-
-			F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");
-			msg->mPacketRing.setDropPercentage(dropPercent);
-
-            F32 inBandwidth = gSavedSettings.getF32("InBandwidth"); 
-            F32 outBandwidth = gSavedSettings.getF32("OutBandwidth"); 
-			if (inBandwidth != 0.f)
-			{
-				LL_DEBUGS("AppInit") << "Setting packetring incoming bandwidth to " << inBandwidth << LL_ENDL;
-				msg->mPacketRing.setUseInThrottle(TRUE);
-				msg->mPacketRing.setInBandwidth(inBandwidth);
-			}
-			if (outBandwidth != 0.f)
-			{
-				LL_DEBUGS("AppInit") << "Setting packetring outgoing bandwidth to " << outBandwidth << LL_ENDL;
-				msg->mPacketRing.setUseOutThrottle(TRUE);
-				msg->mPacketRing.setOutBandwidth(outBandwidth);
-			}
-		}
-
-		LL_INFOS("AppInit") << "Message System Initialized." << LL_ENDL;
-		
-		//-------------------------------------------------
-		// Init audio, which may be needed for prefs dialog
-		// or audio cues in connection UI.
-		//-------------------------------------------------
-
-		if (FALSE == gSavedSettings.getBOOL("NoAudio"))
-		{
-			gAudiop = NULL;
-
-#ifdef LL_OPENAL
-			if (!gAudiop
-#if !LL_WINDOWS
-			    && NULL == getenv("LL_BAD_OPENAL_DRIVER")
-#endif // !LL_WINDOWS
-			    )
-			{
-				gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();
-			}
-#endif
-
-#ifdef LL_FMOD			
-			if (!gAudiop
-#if !LL_WINDOWS
-			    && NULL == getenv("LL_BAD_FMOD_DRIVER")
-#endif // !LL_WINDOWS
-			    )
-			{
-				gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();
-			}
-#endif
-
-			if (gAudiop)
-			{
-#if LL_WINDOWS
-				// FMOD on Windows needs the window handle to stop playing audio
-				// when window is minimized. JC
-				void* window_handle = (HWND)gViewerWindow->getPlatformWindow();
-#else
-				void* window_handle = NULL;
-#endif
-				bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);
-				if(init)
-				{
-					gAudiop->setMuted(TRUE);
-				}
-				else
-				{
-					LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;
-					delete gAudiop;
-					gAudiop = NULL;
-				}
-
-				if (gAudiop)
-				{
-					// if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins
-					if (NULL == gAudiop->getStreamingAudioImpl())
-					{
-						LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;
-						gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());
-					}
-				}
-			}
-		}
-		
-		LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;
-		
-		if (LLTimer::knownBadTimer())
-		{
-			LL_WARNS("AppInit") << "Unreliable timers detected (may be bad PCI chipset)!!" << LL_ENDL;
-		}
-
-		//
-		// Log on to system
-		//
-		if (gUserCredential.isNull())
-		{
-			gUserCredential = gLoginHandler.initializeLoginInfo();
-		}
-		if (gUserCredential.isNull())
-		{
-			show_connect_box = TRUE;
-		}
-		else if (gSavedSettings.getBOOL("AutoLogin"))  
-		{
-			gRememberPassword = TRUE;
-			gSavedSettings.setBOOL("RememberPassword", TRUE);                                                      
-			show_connect_box = false;    			
-		}
-		else 
-		{
-			gRememberPassword = gSavedSettings.getBOOL("RememberPassword");
-			show_connect_box = TRUE;
-		}
-		// Go to the next startup state
-		LLStartUp::setStartupState( STATE_BROWSER_INIT );
-		return FALSE;
-	}
-
-	
-	if (STATE_BROWSER_INIT == LLStartUp::getStartupState())
-	{
-		LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL;
-		std::string msg = LLTrans::getString("LoginInitializingBrowser");
-		set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());
-		display_startup();
-		// LLViewerMedia::initBrowser();
-		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-		return FALSE;
-	}
-
-
-	if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
-	{
-		LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;
-
-		// if we've gone backwards in the login state machine, to this state where we show the UI
-		// AND the debug setting to exit in this case is true, then go ahead and bail quickly
-		if ( mLoginStatePastUI && gSavedSettings.getBOOL("QuitOnLoginActivated") )
-		{
-			// no requirement for notification here - just exit
-			LLAppViewer::instance()->earlyExitNoNotify();
-		}
-
-		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-
-		timeout_count = 0;
-
-		if (show_connect_box)
-		{
-			// Load all the name information out of the login view
-			// NOTE: Hits "Attempted getFields with no login view shown" warning, since we don't
-			// show the login view until login_show() is called below.  
-			if (gUserCredential.isNull())                                                                          
-			{                                                                                                      
-				gUserCredential = gLoginHandler.initializeLoginInfo();                 
-			}     
-			if (gNoRender)
-			{
-				LL_ERRS("AppInit") << "Need to autologin or use command line with norender!" << LL_ENDL;
-			}
-			// Make sure the process dialog doesn't hide things
-			gViewerWindow->setShowProgress(FALSE);
-
-			initialize_edit_menu();
-
-			// Show the login dialog
-			login_show();
-			// connect dialog is already shown, so fill in the names
-			if (gUserCredential.notNull())                                                                         
-			{                                                                                                      
-				LLPanelLogin::setFields( gUserCredential, gRememberPassword);                                  
-			}     
-			LLPanelLogin::giveFocus();
-
-			gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);
-
-			LLStartUp::setStartupState( STATE_LOGIN_WAIT );		// Wait for user input
-		}
-		else
-		{
-			// skip directly to message template verification
-			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
-		}
-
-		// *NOTE: This is where LLViewerParcelMgr::getInstance() used to get allocated before becoming LLViewerParcelMgr::getInstance().
-
-		// *NOTE: This is where gHUDManager used to bet allocated before becoming LLHUDManager::getInstance().
-
-		// *NOTE: This is where gMuteList used to get allocated before becoming LLMuteList::getInstance().
-
-		// Login screen needs menus for preferences, but we can enter
-		// this startup phase more than once.
-		if (gLoginMenuBarView == NULL)
-		{
-			init_menus();
-		}
-		
-		gViewerWindow->setNormalControlsVisible( FALSE );	
-		gLoginMenuBarView->setVisible( TRUE );
-		gLoginMenuBarView->setEnabled( TRUE );
-
-		// Hide the splash screen
-		LLSplashScreen::hide();
-
-		// Push our window frontmost
-		gViewerWindow->getWindow()->show();
-		display_startup();
-
-		// DEV-16927.  The following code removes errant keystrokes that happen while the window is being 
-		// first made visible.
-#ifdef _WIN32
-		MSG msg;
-		while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) );
-#endif
-		timeout.reset();
-		return FALSE;
-	}
-
-	if (STATE_LOGIN_WAIT == LLStartUp::getStartupState())
-	{
-		// when we get to this state, we've already been past the login UI
-		// (possiblely automatically) - flag this so we can test in the 
-		// STATE_LOGIN_SHOW state if we've gone backwards
-		mLoginStatePastUI = true;
-
-		// Don't do anything.  Wait for the login view to call the login_callback,
-		// which will push us to the next state.
-
-		// Sleep so we don't spin the CPU
-		ms_sleep(1);
-		return FALSE;
-	}
-
-	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
-	{
-		//reset the values that could have come in from a slurl
-		// DEV-42215: Make sure they're not empty -- gUserCredential
-		// might already have been set from gSavedSettings, and it's too bad
-		// to overwrite valid values with empty strings.
-
-		if (show_connect_box)
-		{
-			// TODO if not use viewer auth
-			// Load all the name information out of the login view
-			LLPanelLogin::getFields(gUserCredential, gRememberPassword); 
-			// end TODO
-	 
-			// HACK: Try to make not jump on login
-			gKeyboard->resetKeys();
-		}
-
-		// when we get to this state, we've already been past the login UI
-		// (possiblely automatically) - flag this so we can test in the 
-		// STATE_LOGIN_SHOW state if we've gone backwards
-		mLoginStatePastUI = true;
-
-		// save the credentials                                                                                        
-		std::string userid = "unknown";                                                                                
-		if(gUserCredential.notNull())                                                                                  
-		{  
-			userid = gUserCredential->userID();                                                                    
-			gSecAPIHandler->saveCredential(gUserCredential, gRememberPassword);  
-		}
-		gSavedSettings.setBOOL("RememberPassword", gRememberPassword);                                                 
-		LL_INFOS("AppInit") << "Attempting login as: " << userid << LL_ENDL;                                           
-		gDebugInfo["LoginName"] = userid;                                                                              
-         
-		// create necessary directories
-		// *FIX: these mkdir's should error check
-		gDirUtilp->setLindenUserDir(userid);
-		LLFile::mkdir(gDirUtilp->getLindenUserDir());
-
-		// Set PerAccountSettingsFile to the default value.
-		std::string per_account_settings_file = LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount");
-		gSavedSettings.setString("PerAccountSettingsFile",
-			gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 
-				LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")));
-
-		// Note: can't store warnings files per account because some come up before login
-		
-		// Overwrite default user settings with user settings								 
-		LLAppViewer::instance()->loadSettingsFromDirectory("Account");
-
-		// Need to set the LastLogoff time here if we don't have one.  LastLogoff is used for "Recent Items" calculation
-		// and startup time is close enough if we don't have a real value.
-		if (gSavedPerAccountSettings.getU32("LastLogoff") == 0)
-		{
-			gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());
-		}
-
-		//Default the path if one isn't set.
-		// *NOTE: unable to check variable differ from "InstantMessageLogPath" because it was
-		// provided in pre 2.0 viewer. See EXT-6661
-		if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty())
-		{
-			gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir());
-			gSavedPerAccountSettings.setString("InstantMessageLogPath", gDirUtilp->getChatLogsDir());
-		}
-		else
-		{
-			gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));		
-		}
-		gDirUtilp->setPerAccountChatLogsDir(userid);  
-		
-		LLFile::mkdir(gDirUtilp->getChatLogsDir());
-		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
-
-
-		//good a place as any to create user windlight directories
-		std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));
-		LLFile::mkdir(user_windlight_path_name.c_str());		
-
-		std::string user_windlight_skies_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
-		LLFile::mkdir(user_windlight_skies_path_name.c_str());
-
-		std::string user_windlight_water_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
-		LLFile::mkdir(user_windlight_water_path_name.c_str());
-
-		std::string user_windlight_days_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", ""));
-		LLFile::mkdir(user_windlight_days_path_name.c_str());
-
-
-		if (show_connect_box)
-		{
-			LLSLURL slurl;
-			LLPanelLogin::closePanel();
-		}
-
-		
-		// Load URL History File
-		LLURLHistory::loadFile("url_history.xml");
-		// Load location history 
-		LLLocationHistory::getInstance()->load();
-
-		// Load Avatars icons cache
-		LLAvatarIconIDCache::getInstance()->load();
-		
-		// Load media plugin cookies
-		LLViewerMedia::loadCookieFile();
-
-		//-------------------------------------------------
-		// Handle startup progress screen
-		//-------------------------------------------------
-
-		// on startup the user can request to go to their home,
-		// their last location, or some URL "-url //sim/x/y[/z]"
-		// All accounts have both a home and a last location, and we don't support
-		// more locations than that.  Choose the appropriate one.  JC
-		switch (LLStartUp::getStartSLURL().getType())
-		  {
-		  case LLSLURL::LOCATION:
-		    agent_location_id = START_LOCATION_ID_URL;
-		    location_which = START_LOCATION_ID_LAST;
-		    break;
-		  case LLSLURL::LAST_LOCATION:
-		    agent_location_id = START_LOCATION_ID_LAST;
-		    location_which = START_LOCATION_ID_LAST;
-		    break;
-		  default:
-		    agent_location_id = START_LOCATION_ID_HOME;
-		    location_which = START_LOCATION_ID_HOME;
-		    break;
-		  }
-
-		gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
-
-		if (!gNoRender)
-		{
-			init_start_screen(agent_location_id);
-		}
-
-		// Display the startup progress bar.
-		gViewerWindow->setShowProgress(TRUE);
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
-
-		// Poke the VFS, which could potentially block for a while if
-		// Windows XP is acting up
-		set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null);
-		display_startup();
-
-		gVFS->pokeFiles();
-
-		LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
-
-		return FALSE;
-	}
-
-	if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())
-	{
-		gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridLabel();
-
-		// Update progress status and the display loop.
-		auth_desc = LLTrans::getString("LoginInProgress");
-		set_startup_status(progress, auth_desc, auth_message);
-		progress += 0.02f;
-		display_startup();
-
-		// Setting initial values...
-		LLLoginInstance* login = LLLoginInstance::getInstance();
-		login->setNotificationsInterface(LLNotifications::getInstance());
-		if(gNoRender)
-		{
-			// HACK, skip optional updates if you're running drones
-			login->setSkipOptionalUpdate(true);
-		}
-
-		login->setSerialNumber(LLAppViewer::instance()->getSerialNumber());
-		login->setLastExecEvent(gLastExecEvent);
-		login->setUpdaterLauncher(boost::bind(&LLAppViewer::launchUpdater, LLAppViewer::instance()));
-
-		// This call to LLLoginInstance::connect() starts the 
-		// authentication process.
-		login->connect(gUserCredential);
-
-		LLStartUp::setStartupState( STATE_LOGIN_CURL_UNSTUCK );
-		return FALSE;
-	}
-
-	if(STATE_LOGIN_CURL_UNSTUCK == LLStartUp::getStartupState())
-	{
-		// If we get here we have gotten past the potential stall
-		// in curl, so take "may appear frozen" out of progress bar. JC
-		auth_desc = LLTrans::getString("LoginInProgressNoFrozen");
-		set_startup_status(progress, auth_desc, auth_message);
-
-		LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );
-		return FALSE;
-	}
-
-	if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState()) 
-	{
-		std::ostringstream emsg;
-		emsg << LLTrans::getString("LoginFailed") << "\n";
-		if(LLLoginInstance::getInstance()->authFailure())
-		{
-			LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): "
-			                      << LLLoginInstance::getInstance()->getResponse() << LL_ENDL;
-			LLSD response = LLLoginInstance::getInstance()->getResponse();
-			// Still have error conditions that may need some 
-			// sort of handling.
-			std::string reason_response = response["reason"];
-			std::string message_response = response["message"];
-	
-			if(!message_response.empty())
-			{
-				// XUI: fix translation for strings returned during login
-				// We need a generic table for translations
-				std::string big_reason = LLAgent::sTeleportErrorMessages[ message_response ];
-				if ( big_reason.size() == 0 )
-				{
-					emsg << message_response;
-				}
-				else
-				{
-					emsg << big_reason;
-				}
-			}
-
-			if(reason_response == "key")
-			{
-				// Couldn't login because user/password is wrong
-				// Clear the credential
-				gUserCredential->clearAuthenticator();
-			}
-
-			if(reason_response == "update" 
-				|| reason_response == "optional")
-			{
-				// In the case of a needed update, quit.
-				// Its either downloading or declined.
-				// If optional was skipped this case shouldn't 
-				// be reached.
-				LLLoginInstance::getInstance()->disconnect();
-				LLAppViewer::instance()->forceQuit();
-			}
-			else 
-			{
-				if (reason_response != "tos") 
-				{
-					// Don't pop up a notification in the TOS case because
-					// LLFloaterTOS::onCancel() already scolded the user.
-					std::string error_code;
-					if(response.has("errorcode"))
-					{
-						error_code = response["errorcode"].asString();
-					}
-					if ((reason_response == "CURLError") && 
-						(error_code == "SSL_CACERT" || error_code == "SSL_PEER_CERTIFICATE") && 
-						response.has("certificate"))
-					{
-						// This was a certificate error, so grab the certificate
-						// and throw up the appropriate dialog.
-						LLPointer<LLCertificate> certificate = gSecAPIHandler->getCertificate(response["certificate"]);
-						if(certificate)
-						{
-							LLSD args = transform_cert_args(certificate);
-
-							if(error_code == "SSL_CACERT")
-							{
-								// if we are handling an untrusted CA, throw up the dialog                             
-								// with the 'trust this CA' button.                                                    
-								LLNotificationsUtil::add("TrustCertificateError", args, response,
-														trust_cert_done);
-								
-								show_connect_box = true;
-							}
-							else
-							{
-								// the certificate exception returns a unique string for each type of exception.       
-								// we grab this string via the LLUserAuth object, and use that to grab the localized   
-								// string.                                                                             
-								args["REASON"] = LLTrans::getString(message_response);
-								
-								LLNotificationsUtil::add("GeneralCertificateError", args, response,
-														 general_cert_done);
-								
-								reset_login();
-								gSavedSettings.setBOOL("AutoLogin", FALSE);
-								show_connect_box = true;
-								
-							}
-
-						}
-					}
-					else 
-					{
-						// This wasn't a certificate error, so throw up the normal
-						// notificatioin message.
-						LLSD args;
-						args["ERROR_MESSAGE"] = emsg.str();
-						LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;
-						LLNotificationsUtil::add("ErrorMessage", args, LLSD(), login_alert_done);
-					}
-				}
-				//setup map of datetime strings to codes and slt & local time offset from utc
-				// *TODO: Does this need to be here?
-				LLStringOps::setupDatetimeInfo (false);
-				transition_back_to_login_panel(emsg.str());
-				show_connect_box = true;
-			}
-		}
-		else if(LLLoginInstance::getInstance()->authSuccess())
-		{
-			if(process_login_success_response())
-			{
-				// Pass the user information to the voice chat server interface.
-				LLVoiceClient::getInstance()->userAuthorized(gUserCredential->userID(), gAgentID);
-				// create the default proximal channel
-				LLVoiceChannel::initClass();
-				LLGridManager::getInstance()->setFavorite(); 
-				LLStartUp::setStartupState( STATE_WORLD_INIT);
-			}
-			else
-			{
-				LLSD args;
-				args["ERROR_MESSAGE"] = emsg.str();
-				LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;
-				LLNotificationsUtil::add("ErrorMessage", args, LLSD(), login_alert_done);
-				transition_back_to_login_panel(emsg.str());
-				show_connect_box = true;
-				return FALSE;
-			}
-		}
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// World Init
-	//---------------------------------------------------------------------
-	if (STATE_WORLD_INIT == LLStartUp::getStartupState())
-	{
-		set_startup_status(0.30f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
-		display_startup();
-		// We should have an agent id by this point.
-		llassert(!(gAgentID == LLUUID::null));
-
-		// Finish agent initialization.  (Requires gSavedSettings, builds camera)
-		gAgent.init();
-		gAgentCamera.init();
-		set_underclothes_menu_options();
-
-		// Since we connected, save off the settings so the user doesn't have to
-		// type the name/password again if we crash.
-		gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
-		LLUIColorTable::instance().saveUserSettings();
-
-		//
-		// Initialize classes w/graphics stuff.
-		//
-		gTextureList.doPrefetchImages();		
-		LLSurface::initClasses();
-
-		LLFace::initClass();
-
-		LLDrawable::initClass();
-
-		// init the shader managers
-		LLPostProcess::initClass();
-		LLWLParamManager::initClass();
-		LLWaterParamManager::initClass();
-
-		LLViewerObject::initVOClasses();
-
-		// Initialize all our tools.  Must be done after saved settings loaded.
-		// NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.
-		LLToolMgr::getInstance()->initTools();
-
-		// Pre-load floaters, like the world map, that are slow to spawn
-		// due to XML complexity.
-		gViewerWindow->initWorldUI();
-
-		display_startup();
-
-		// This is where we used to initialize gWorldp. Original comment said:
-		// World initialization must be done after above window init
-
-		// User might have overridden far clip
-		LLWorld::getInstance()->setLandFarClip(gAgentCamera.mDrawDistance);
-
-		// Before we create the first region, we need to set the agent's mOriginGlobal
-		// This is necessary because creating objects before this is set will result in a
-		// bad mPositionAgent cache.
-
-		gAgent.initOriginGlobal(from_region_handle(gFirstSimHandle));
-
-		LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim);
-
-		LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(gFirstSimHandle);
-		LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;
-		
-		regionp->setSeedCapability(gFirstSimSeedCap);
-		LL_DEBUGS("AppInit") << "Waiting for seed grant ...." << LL_ENDL;
-		
-		// Set agent's initial region to be the one we just created.
-		gAgent.setRegion(regionp);
-
-		// Set agent's initial position, which will be read by LLVOAvatar when the avatar
-		// object is created.  I think this must be done after setting the region.  JC
-		gAgent.setPositionAgent(agent_start_position_region);
-
-		display_startup();
-		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
-		
-		return FALSE;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Load QuickTime/GStreamer and other multimedia engines, can be slow.
-	// Do it while we're waiting on the network for our seed capability. JC
-	//---------------------------------------------------------------------
-	if (STATE_MULTIMEDIA_INIT == LLStartUp::getStartupState())
-	{
-		LLStartUp::multimediaInit();
-		LLStartUp::setStartupState( STATE_FONT_INIT );
-		return FALSE;
-	}
-
-	// Loading fonts takes several seconds
-	if (STATE_FONT_INIT == LLStartUp::getStartupState())
-	{
-		LLStartUp::fontInit();
-		LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// Wait for Seed Cap Grant
-	//---------------------------------------------------------------------
-	if(STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
-	{
-		return FALSE;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Seed Capability Granted
-	// no newMessage calls should happen before this point
-	//---------------------------------------------------------------------
-	if (STATE_SEED_CAP_GRANTED == LLStartUp::getStartupState())
-	{
-		update_texture_fetch();
-
-		if ( gViewerWindow != NULL)
-		{	// This isn't the first logon attempt, so show the UI
-			gViewerWindow->setNormalControlsVisible( TRUE );
-		}	
-		gLoginMenuBarView->setVisible( FALSE );
-		gLoginMenuBarView->setEnabled( FALSE );
-
-		if (!gNoRender)
-		{
-			// direct logging to the debug console's line buffer
-			LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
-			
-			// set initial visibility of debug console
-			gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
-		}
-
-		//
-		// Set message handlers
-		//
-		LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL;
-
-		// register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted
-		register_viewer_callbacks(gMessageSystem);
-
-		// Debugging info parameters
-		gMessageSystem->setMaxMessageTime( 0.5f );			// Spam if decoding all msgs takes more than 500 ms
-
-		#ifndef	LL_RELEASE_FOR_DOWNLOAD
-			gMessageSystem->setTimeDecodes( TRUE );				// Time the decode of each msg
-			gMessageSystem->setTimeDecodesSpamThreshold( 0.05f );  // Spam if a single msg takes over 50ms to decode
-		#endif
-
-		gXferManager->registerCallbacks(gMessageSystem);
-
-		LLStartUp::initNameCache();
-
-		// update the voice settings *after* gCacheName initialization
-		// so that we can construct voice UI that relies on the name cache
-		LLVoiceClient::getInstance()->updateSettings();
-
-		//gCacheName is required for nearby chat history loading
-		//so I just moved nearby history loading a few states further
-		if (!gNoRender && gSavedPerAccountSettings.getBOOL("LogShowHistory"))
-		{
-			LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();
-			if (nearby_chat) nearby_chat->loadHistory();
-		}
-
-		// *Note: this is where gWorldMap used to be initialized.
-
-		// register null callbacks for audio until the audio system is initialized
-		gMessageSystem->setHandlerFuncFast(_PREHASH_SoundTrigger, null_message_callback, NULL);
-		gMessageSystem->setHandlerFuncFast(_PREHASH_AttachedSound, null_message_callback, NULL);
-
-		//reset statistics
-		LLViewerStats::getInstance()->resetStats();
-
-		display_startup();
-		//
-		// Set up region and surface defaults
-		//
-
-
-		// Sets up the parameters for the first simulator
-
-		LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL;
-		gFrameTime    = totalTime();
-		F32 last_time = gFrameTimeSeconds;
-		gFrameTimeSeconds = (S64)(gFrameTime - gStartTime)/SEC_TO_MICROSEC;
-
-		gFrameIntervalSeconds = gFrameTimeSeconds - last_time;
-		if (gFrameIntervalSeconds < 0.f)
-		{
-			gFrameIntervalSeconds = 0.f;
-		}
-
-		// Make sure agent knows correct aspect ratio
-		// FOV limits depend upon aspect ratio so this needs to happen before initializing the FOV below
-		LLViewerCamera::getInstance()->setViewHeightInPixels(gViewerWindow->getWorldViewHeightRaw());
-		LLViewerCamera::getInstance()->setAspect(gViewerWindow->getWorldViewAspectRatio());
-		// Initialize FOV
-		LLViewerCamera::getInstance()->setDefaultFOV(gSavedSettings.getF32("CameraAngle")); 
-
-		// Move agent to starting location. The position handed to us by
-		// the space server is in global coordinates, but the agent frame
-		// is in region local coordinates. Therefore, we need to adjust
-		// the coordinates handed to us to fit in the local region.
-
-		gAgent.setPositionAgent(agent_start_position_region);
-		gAgent.resetAxes(gAgentStartLookAt);
-		gAgentCamera.stopCameraAnimation();
-		gAgentCamera.resetCamera();
-
-		// Initialize global class data needed for surfaces (i.e. textures)
-		if (!gNoRender)
-		{
-			LL_DEBUGS("AppInit") << "Initializing sky..." << LL_ENDL;
-			// Initialize all of the viewer object classes for the first time (doing things like texture fetches.
-			LLGLState::checkStates();
-			LLGLState::checkTextureChannels();
-
-			gSky.init(initial_sun_direction);
-
-			LLGLState::checkStates();
-			LLGLState::checkTextureChannels();
-		}
-
-		LL_DEBUGS("AppInit") << "Decoding images..." << LL_ENDL;
-		// For all images pre-loaded into viewer cache, decode them.
-		// Need to do this AFTER we init the sky
-		const S32 DECODE_TIME_SEC = 2;
-		for (int i = 0; i < DECODE_TIME_SEC; i++)
-		{
-			F32 frac = (F32)i / (F32)DECODE_TIME_SEC;
-			set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages"), gAgent.mMOTD);
-			display_startup();
-			gTextureList.decodeAllImages(1.f);
-		}
-		LLStartUp::setStartupState( STATE_WORLD_WAIT );
-
-		// JC - Do this as late as possible to increase likelihood Purify
-		// will run.
-		LLMessageSystem* msg = gMessageSystem;
-		if (!msg->mOurCircuitCode)
-		{
-			LL_WARNS("AppInit") << "Attempting to connect to simulator with a zero circuit code!" << LL_ENDL;
-		}
-
-		gUseCircuitCallbackCalled = false;
-
-		msg->enableCircuit(gFirstSim, TRUE);
-		// now, use the circuit info to tell simulator about us!
-		LL_INFOS("AppInit") << "viewer: UserLoginLocationReply() Enabling " << gFirstSim << " with code " << msg->mOurCircuitCode << LL_ENDL;
-		msg->newMessageFast(_PREHASH_UseCircuitCode);
-		msg->nextBlockFast(_PREHASH_CircuitCode);
-		msg->addU32Fast(_PREHASH_Code, msg->mOurCircuitCode);
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->addUUIDFast(_PREHASH_ID, gAgent.getID());
-		msg->sendReliable(
-			gFirstSim,
-			gSavedSettings.getS32("UseCircuitCodeMaxRetries"),
-			FALSE,
-			gSavedSettings.getF32("UseCircuitCodeTimeout"),
-			use_circuit_callback,
-			NULL);
-
-		timeout.reset();
-
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// Agent Send
-	//---------------------------------------------------------------------
-	if(STATE_WORLD_WAIT == LLStartUp::getStartupState())
-	{
-		LL_DEBUGS("AppInit") << "Waiting for simulator ack...." << LL_ENDL;
-		set_startup_status(0.59f, LLTrans::getString("LoginWaitingForRegionHandshake"), gAgent.mMOTD);
-		if(gGotUseCircuitCodeAck)
-		{
-			LLStartUp::setStartupState( STATE_AGENT_SEND );
-		}
-		LLMessageSystem* msg = gMessageSystem;
-		while (msg->checkAllMessages(gFrameCount, gServicePump))
-		{
-		}
-		msg->processAcks();
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// Agent Send
-	//---------------------------------------------------------------------
-	if (STATE_AGENT_SEND == LLStartUp::getStartupState())
-	{
-		LL_DEBUGS("AppInit") << "Connecting to region..." << LL_ENDL;
-		set_startup_status(0.60f, LLTrans::getString("LoginConnectingToRegion"), gAgent.mMOTD);
-		// register with the message system so it knows we're
-		// expecting this message
-		LLMessageSystem* msg = gMessageSystem;
-		msg->setHandlerFuncFast(
-			_PREHASH_AgentMovementComplete,
-			process_agent_movement_complete);
-		LLViewerRegion* regionp = gAgent.getRegion();
-		if(regionp)
-		{
-			send_complete_agent_movement(regionp->getHost());
-			gAssetStorage->setUpstream(regionp->getHost());
-			gCacheName->setUpstream(regionp->getHost());
-			msg->newMessageFast(_PREHASH_EconomyDataRequest);
-			gAgent.sendReliableMessage();
-		}
-
-		// Create login effect
-		// But not on first login, because you can't see your avatar then
-		if (!gAgent.isFirstLogin())
-		{
-			LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-			effectp->setPositionGlobal(gAgent.getPositionGlobal());
-			effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-			LLHUDManager::getInstance()->sendEffects();
-		}
-
-		LLStartUp::setStartupState( STATE_AGENT_WAIT );		// Go to STATE_AGENT_WAIT
-
-		timeout.reset();
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// Agent Wait
-	//---------------------------------------------------------------------
-	if (STATE_AGENT_WAIT == LLStartUp::getStartupState())
-	{
-		LLMessageSystem* msg = gMessageSystem;
-		while (msg->checkAllMessages(gFrameCount, gServicePump))
-		{
-			if (gAgentMovementCompleted)
-			{
-				// Sometimes we have more than one message in the
-				// queue. break out of this loop and continue
-				// processing. If we don't, then this could skip one
-				// or more login steps.
-				break;
-			}
-			else
-			{
-				LL_DEBUGS("AppInit") << "Awaiting AvatarInitComplete, got "
-				<< msg->getMessageName() << LL_ENDL;
-			}
-		}
-		msg->processAcks();
-
-		if (gAgentMovementCompleted)
-		{
-			LLStartUp::setStartupState( STATE_INVENTORY_SEND );
-		}
-
-		return FALSE;
-	}
-
-	//---------------------------------------------------------------------
-	// Inventory Send
-	//---------------------------------------------------------------------
-	if (STATE_INVENTORY_SEND == LLStartUp::getStartupState())
-	{
-		// Inform simulator of our language preference
-		LLAgentLanguage::update();
-
-		// unpack thin inventory
-		LLSD response = LLLoginInstance::getInstance()->getResponse();
-		//bool dump_buffer = false;
-
-		LLSD inv_lib_root = response["inventory-lib-root"];
-		if(inv_lib_root.isDefined())
-		{
-			// should only be one
-			LLSD id = inv_lib_root[0]["folder_id"];
-			if(id.isDefined())
-			{
-				gInventory.setLibraryRootFolderID(id.asUUID());
-			}
-		}
- 		
-		LLSD inv_lib_owner = response["inventory-lib-owner"];
-		if(inv_lib_owner.isDefined())
-		{
-			// should only be one
-			LLSD id = inv_lib_owner[0]["agent_id"];
-			if(id.isDefined())
-			{
-				gInventory.setLibraryOwnerID( LLUUID(id.asUUID()));
-			}
-		}
-
-		LLSD inv_skel_lib = response["inventory-skel-lib"];
- 		if(inv_skel_lib.isDefined() && gInventory.getLibraryOwnerID().notNull())
- 		{
- 			if(!gInventory.loadSkeleton(inv_skel_lib, gInventory.getLibraryOwnerID()))
- 			{
- 				LL_WARNS("AppInit") << "Problem loading inventory-skel-lib" << LL_ENDL;
- 			}
- 		}
-
-		LLSD inv_skeleton = response["inventory-skeleton"];
- 		if(inv_skeleton.isDefined())
- 		{
- 			if(!gInventory.loadSkeleton(inv_skeleton, gAgent.getID()))
- 			{
- 				LL_WARNS("AppInit") << "Problem loading inventory-skel-targets" << LL_ENDL;
- 			}
- 		}
-
-		LLSD buddy_list = response["buddy-list"];
- 		if(buddy_list.isDefined())
- 		{
-			LLAvatarTracker::buddy_map_t list;
-			LLUUID agent_id;
-			S32 has_rights = 0, given_rights = 0;
-			for(LLSD::array_const_iterator it = buddy_list.beginArray(),
-				end = buddy_list.endArray(); it != end; ++it)
-			{
-				LLSD buddy_id = (*it)["buddy_id"];
-				if(buddy_id.isDefined())
-				{
-					agent_id = buddy_id.asUUID();
-				}
-
-				LLSD buddy_rights_has = (*it)["buddy_rights_has"];
-				if(buddy_rights_has.isDefined())
-				{
-					has_rights = buddy_rights_has.asInteger();
-				}
-
-				LLSD buddy_rights_given = (*it)["buddy_rights_given"];
-				if(buddy_rights_given.isDefined())
-				{
-					given_rights = buddy_rights_given.asInteger();
-				}
-
-				list[agent_id] = new LLRelationship(given_rights, has_rights, false);
-			}
-			LLAvatarTracker::instance().addBuddyList(list);
- 		}
-
-		bool show_hud = false;
-		LLSD tutorial_setting = response["tutorial_setting"];
-		if(tutorial_setting.isDefined())
-		{
-			for(LLSD::array_const_iterator it = tutorial_setting.beginArray(),
-				end = tutorial_setting.endArray(); it != end; ++it)
-			{
-				LLSD tutorial_url = (*it)["tutorial_url"];
-				if(tutorial_url.isDefined())
-				{
-					// Tutorial floater will append language code
-					gSavedSettings.setString("TutorialURL", tutorial_url.asString());
-				}
-				
-				// For Viewer 2.0 we are not using the web-based tutorial
-				// If we reverse that decision, put this code back and use
-				// login.cgi to send a different URL with content that matches
-				// the Viewer 2.0 UI.
-				//LLSD use_tutorial = (*it)["use_tutorial"];
-				//if(use_tutorial.asString() == "true")
-				//{
-				//	show_hud = true;
-				//}
-			}
-		}
-		// Either we want to show tutorial because this is the first login
-		// to a Linden Help Island or the user quit with the tutorial
-		// visible.  JC
-		if (show_hud || gSavedSettings.getBOOL("ShowTutorial"))
-		{
-			LLFloaterReg::showInstance("hud", LLSD(), FALSE);
-		}
-
-		LLSD event_notifications = response["event_notifications"];
-		if(event_notifications.isDefined())
-		{
-			gEventNotifier.load(event_notifications);
-		}
-
-		LLSD classified_categories = response["classified_categories"];
-		if(classified_categories.isDefined())
-		{
-			LLClassifiedInfo::loadCategories(classified_categories);
-		}
-
-		// This method MUST be called before gInventory.findCategoryUUIDForType because of 
-		// gInventory.mIsAgentInvUsable is set to true in the gInventory.buildParentChildMap.
-		gInventory.buildParentChildMap();
-
-		//all categories loaded. lets create "My Favorites" category
-		gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE,true);
-
-		// set up callbacks
-		llinfos << "Registering Callbacks" << llendl;
-		LLMessageSystem* msg = gMessageSystem;
-		llinfos << " Inventory" << llendl;
-		LLInventoryModel::registerCallbacks(msg);
-		llinfos << " AvatarTracker" << llendl;
-		LLAvatarTracker::instance().registerCallbacks(msg);
-		llinfos << " Landmark" << llendl;
-		LLLandmark::registerCallbacks(msg);
-
-		// request mute list
-		llinfos << "Requesting Mute List" << llendl;
-		LLMuteList::getInstance()->requestFromServer(gAgent.getID());
-
-		// Get L$ and ownership credit information
-		llinfos << "Requesting Money Balance" << llendl;
-		LLStatusBar::sendMoneyBalanceRequest();
-
-		// request all group information
-		llinfos << "Requesting Agent Data" << llendl;
-		gAgent.sendAgentDataUpdateRequest();
-
-		// Create the inventory views
-		llinfos << "Creating Inventory Views" << llendl;
-		LLFloaterReg::getInstance("inventory");
-
-		LLStartUp::setStartupState( STATE_MISC );
-		return FALSE;
-	}
-
-
-	//---------------------------------------------------------------------
-	// Misc
-	//---------------------------------------------------------------------
-	if (STATE_MISC == LLStartUp::getStartupState())
-	{
-		// We have a region, and just did a big inventory download.
-		// We can estimate the user's connection speed, and set their
-		// max bandwidth accordingly.  JC
-		if (gSavedSettings.getBOOL("FirstLoginThisInstall"))
-		{
-			// This is actually a pessimistic computation, because TCP may not have enough
-			// time to ramp up on the (small) default inventory file to truly measure max
-			// bandwidth. JC
-			F64 rate_bps = LLLoginInstance::getInstance()->getLastTransferRateBPS();
-			const F32 FAST_RATE_BPS = 600.f * 1024.f;
-			const F32 FASTER_RATE_BPS = 750.f * 1024.f;
-			F32 max_bandwidth = gViewerThrottle.getMaxBandwidth();
-			if (rate_bps > FASTER_RATE_BPS
-				&& rate_bps > max_bandwidth)
-			{
-				LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 
-					<< FASTER_RATE_BPS/1024.f 
-					<< " kbps" << LL_ENDL;
-				gViewerThrottle.setMaxBandwidth(FASTER_RATE_BPS / 1024.f);
-			}
-			else if (rate_bps > FAST_RATE_BPS
-				&& rate_bps > max_bandwidth)
-			{
-				LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 
-					<< FAST_RATE_BPS/1024.f 
-					<< " kbps" << LL_ENDL;
-				gViewerThrottle.setMaxBandwidth(FAST_RATE_BPS / 1024.f);
-			}
-
-			// Set the show start location to true, now that the user has logged
-			// on with this install.
-			gSavedSettings.setBOOL("ShowStartLocation", TRUE);
-		}
-
-		// We're successfully logged in.
-		gSavedSettings.setBOOL("FirstLoginThisInstall", FALSE);
-
-		LLFloaterReg::showInitialVisibleInstances();
-
-		// based on the comments, we've successfully logged in so we can delete the 'forced'
-		// URL that the updater set in settings.ini (in a mostly paranoid fashion)
-		std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );
-		if ( nextLoginLocation.length() )
-		{
-			// clear it
-			gSavedSettings.setString( "NextLoginLocation", "" );
-
-			// and make sure it's saved
-			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			LLUIColorTable::instance().saveUserSettings();
-		};
-
-		if (!gNoRender)
-		{
-			// JC: Initializing audio requests many sounds for download.
-			init_audio();
-
-			// JC: Initialize "active" gestures.  This may also trigger
-			// many gesture downloads, if this is the user's first
-			// time on this machine or -purge has been run.
-			LLSD gesture_options 
-				= LLLoginInstance::getInstance()->getResponse("gestures");
-			if (gesture_options.isDefined())
-			{
-				LL_DEBUGS("AppInit") << "Gesture Manager loading " << gesture_options.size()
-					<< LL_ENDL;
-				uuid_vec_t item_ids;
-				for(LLSD::array_const_iterator resp_it = gesture_options.beginArray(),
-					end = gesture_options.endArray(); resp_it != end; ++resp_it)
-				{
-					// If the id is not specifed in the LLSD,
-					// the LLSD operator[]() will return a null LLUUID. 
-					LLUUID item_id = (*resp_it)["item_id"];
-					LLUUID asset_id = (*resp_it)["asset_id"];
-
-					if (item_id.notNull() && asset_id.notNull())
-					{
-						// Could schedule and delay these for later.
-						const BOOL no_inform_server = FALSE;
-						const BOOL no_deactivate_similar = FALSE;
-						LLGestureMgr::instance().activateGestureWithAsset(item_id, asset_id,
-											 no_inform_server,
-											 no_deactivate_similar);
-						// We need to fetch the inventory items for these gestures
-						// so we have the names to populate the UI.
-						item_ids.push_back(item_id);
-					}
-				}
-				// no need to add gesture to inventory observer, it's already made in constructor 
-				LLGestureMgr::instance().setFetchIDs(item_ids);
-				LLGestureMgr::instance().startFetch();
-			}
-		}
-		gDisplaySwapBuffers = TRUE;
-
-		LLMessageSystem* msg = gMessageSystem;
-		msg->setHandlerFuncFast(_PREHASH_SoundTrigger,				process_sound_trigger);
-		msg->setHandlerFuncFast(_PREHASH_PreloadSound,				process_preload_sound);
-		msg->setHandlerFuncFast(_PREHASH_AttachedSound,				process_attached_sound);
-		msg->setHandlerFuncFast(_PREHASH_AttachedSoundGainChange,	process_attached_sound_gain_change);
-
-		LL_DEBUGS("AppInit") << "Initialization complete" << LL_ENDL;
-
-		gRenderStartTime.reset();
-		gForegroundTime.reset();
-
-		// HACK: Inform simulator of window size.
-		// Do this here so it's less likely to race with RegisterNewAgent.
-		// TODO: Put this into RegisterNewAgent
-		// JC - 7/20/2002
-		gViewerWindow->sendShapeToSim();
-
-		
-		// Ignore stipend information for now.  Money history is on the web site.
-		// if needed, show the L$ history window
-		//if (stipend_since_login && !gNoRender)
-		//{
-		//}
-
-		// The reason we show the alert is because we want to
-		// reduce confusion for when you log in and your provided
-		// location is not your expected location. So, if this is
-		// your first login, then you do not have an expectation,
-		// thus, do not show this alert.
-		if (!gAgent.isFirstLogin())
-		{
-			llinfos << "gAgentStartLocation : " << gAgentStartLocation << llendl;
-			LLSLURL start_slurl = LLStartUp::getStartSLURL();
-			
-			if (((start_slurl.getType() == LLSLURL::LOCATION) && (gAgentStartLocation == "url")) ||
-				((start_slurl.getType() == LLSLURL::LAST_LOCATION) && (gAgentStartLocation == "last")) ||
-				((start_slurl.getType() == LLSLURL::HOME_LOCATION) && (gAgentStartLocation == "home")))
-			{
-				// Start location is OK
-				// Disabled code to restore camera location and focus if logging in to default location
-				static bool samename = false;
-				if (samename)
-				{
-					// restore old camera pos
-					gAgentCamera.setFocusOnAvatar(FALSE, FALSE);
-					gAgentCamera.setCameraPosAndFocusGlobal(gSavedSettings.getVector3d("CameraPosOnLogout"), gSavedSettings.getVector3d("FocusPosOnLogout"), LLUUID::null);
-					BOOL limit_hit = FALSE;
-					gAgentCamera.calcCameraPositionTargetGlobal(&limit_hit);
-					if (limit_hit)
-					{
-						gAgentCamera.setFocusOnAvatar(TRUE, FALSE);
-					}
-					gAgentCamera.stopCameraAnimation();
-				}
-			}
-			else
-			{
-				std::string msg;
-				switch(start_slurl.getType())
-				{
-					case LLSLURL::LOCATION:
-					{
-						
-						msg = "AvatarMovedDesired";
-						break;
-					}
-					case LLSLURL::HOME_LOCATION:
-					{
-						msg = "AvatarMovedHome";
-						break;
-					}
-					default:
-					{
-						msg = "AvatarMovedLast";
-					}
-				}
-				LLNotificationsUtil::add(msg);
-			}
-		}
-
-        //DEV-17797.  get null folder.  Any items found here moved to Lost and Found
-        LLInventoryModelBackgroundFetch::instance().findLostItems();
-
-		LLStartUp::setStartupState( STATE_PRECACHE );
-		timeout.reset();
-		return FALSE;
-	}
-
-	if (STATE_PRECACHE == LLStartUp::getStartupState())
-	{
-		F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY;
-
-		// We now have an inventory skeleton, so if this is a user's first
-		// login, we can start setting up their clothing and avatar 
-		// appearance.  This helps to avoid the generic "Ruth" avatar in
-		// the orientation island tutorial experience. JC
-		if (gAgent.isFirstLogin()
-			&& !sInitialOutfit.empty()    // registration set up an outfit
-			&& !sInitialOutfitGender.empty() // and a gender
-			&& isAgentAvatarValid()	  // can't wear clothes without object
-			&& !gAgent.isGenderChosen() ) // nothing already loading
-		{
-			// Start loading the wearables, textures, gestures
-			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
-		}
-
-		// wait precache-delay and for agent's avatar or a lot longer.
-		if(((timeout_frac > 1.f) && isAgentAvatarValid())
-		   || (timeout_frac > 3.f))
-		{
-			LLStartUp::setStartupState( STATE_WEARABLES_WAIT );
-		}
-		else
-		{
-			update_texture_fetch();
-			set_startup_status(0.60f + 0.30f * timeout_frac,
-				LLTrans::getString("LoginPrecaching"),
-					gAgent.mMOTD);
-			display_startup();
-			if (!LLViewerShaderMgr::sInitialized)
-			{
-				LLViewerShaderMgr::sInitialized = TRUE;
-				LLViewerShaderMgr::instance()->setShaders();
-			}
-		}
-		
-		return TRUE;
-	}
-
-	if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())
-	{
-		static LLFrameTimer wearables_timer;
-
-		const F32 wearables_time = wearables_timer.getElapsedTimeF32();
-		const F32 MAX_WEARABLES_TIME = 10.f;
-
-		if (!gAgent.isGenderChosen())
-		{
-			// No point in waiting for clothing, we don't even
-			// know what gender we are.  Pop a dialog to ask and
-			// proceed to draw the world. JC
-			//
-			// *NOTE: We might hit this case even if we have an
-			// initial outfit, but if the load hasn't started
-			// already then something is wrong so fall back
-			// to generic outfits. JC
-			LLNotificationsUtil::add("WelcomeChooseSex", LLSD(), LLSD(),
-				callback_choose_gender);
-			LLStartUp::setStartupState( STATE_CLEANUP );
-			return TRUE;
-		}
-		
-		if (wearables_time > MAX_WEARABLES_TIME)
-		{
-			LLNotificationsUtil::add("ClothingLoading");
-			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);
-			LLStartUp::setStartupState( STATE_CLEANUP );
-			return TRUE;
-		}
-
-		if (gAgent.isFirstLogin())
-		{
-			// wait for avatar to be completely loaded
-			if (isAgentAvatarValid()
-				&& gAgentAvatarp->isFullyLoaded())
-			{
-				//llinfos << "avatar fully loaded" << llendl;
-				LLStartUp::setStartupState( STATE_CLEANUP );
-				return TRUE;
-			}
-		}
-		else
-		{
-			// OK to just get the wearables
-			if ( gAgentWearables.areWearablesLoaded() )
-			{
-				// We have our clothing, proceed.
-				//llinfos << "wearables loaded" << llendl;
-				LLStartUp::setStartupState( STATE_CLEANUP );
-				return TRUE;
-			}
-		}
-
-		update_texture_fetch();
-		set_startup_status(0.9f + 0.1f * wearables_time / MAX_WEARABLES_TIME,
-						 LLTrans::getString("LoginDownloadingClothing").c_str(),
-						 gAgent.mMOTD.c_str());
-		return TRUE;
-	}
-
-	if (STATE_CLEANUP == LLStartUp::getStartupState())
-	{
-		set_startup_status(1.0, "", "");
-
-		// Let the map know about the inventory.
-		LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
-		if(floater_world_map)
-		{
-			floater_world_map->observeInventory(&gInventory);
-			floater_world_map->observeFriends();
-		}
-		gViewerWindow->showCursor();
-		gViewerWindow->getWindow()->resetBusyCount();
-		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
-		LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;
-		gViewerWindow->setShowProgress(FALSE);
-		gViewerWindow->setProgressCancelButtonVisible(FALSE);
-
-		// We're not away from keyboard, even though login might have taken
-		// a while. JC
-		gAgent.clearAFK();
-
-		// Have the agent start watching the friends list so we can update proxies
-		gAgent.observeFriends();
-		if (gSavedSettings.getBOOL("LoginAsGod"))
-		{
-			gAgent.requestEnterGodMode();
-		}
-		
-		// Start automatic replay if the flag is set.
-		if (gSavedSettings.getBOOL("StatsAutoRun") || LLAgentPilot::sReplaySession)
-		{
-			LLUUID id;
-			LL_DEBUGS("AppInit") << "Starting automatic playback" << LL_ENDL;
-			gAgentPilot.startPlayback();
-		}
-
-		show_debug_menus(); // Debug menu visiblity and First Use trigger
-		
-		// If we've got a startup URL, dispatch it
-		LLStartUp::dispatchURL();
-
-		// Retrieve information about the land data
-		// (just accessing this the first time will fetch it,
-		// then the data is cached for the viewer's lifetime)
-		LLProductInfoRequestManager::instance();
-		
-		// *FIX:Mani - What do I do here?
-		// Need we really clear the Auth response data?
-		// Clean up the userauth stuff.
-		// LLUserAuth::getInstance()->reset();
-
-		LLStartUp::setStartupState( STATE_STARTED );
-
-		// Unmute audio if desired and setup volumes.
-		// Unmute audio if desired and setup volumes.
-		// This is a not-uncommon crash site, so surround it with
-		// llinfos output to aid diagnosis.
-		LL_INFOS("AppInit") << "Doing first audio_update_volume..." << LL_ENDL;
-		audio_update_volume();
-		LL_INFOS("AppInit") << "Done first audio_update_volume." << LL_ENDL;
-
-		// reset keyboard focus to sane state of pointing at world
-		gFocusMgr.setKeyboardFocus(NULL);
-
-#if 0 // sjb: enable for auto-enabling timer display 
-		gDebugView->mFastTimerView->setVisible(TRUE);
-#endif
-
-		LLAppViewer::instance()->handleLoginComplete();
-
-		// reset timers now that we are running "logged in" logic
-		LLFastTimer::reset();
-
-		LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
-
-		LLIMFloater::initIMFloater();
-
-		return TRUE;
-	}
-
-	LL_WARNS("AppInit") << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << LL_ENDL;
-	return TRUE;
-}
-
-//
-// local function definition
-//
-
-void login_show()
-{
-	LL_INFOS("AppInit") << "Initializing Login Screen" << LL_ENDL;
-
-#ifdef LL_RELEASE_FOR_DOWNLOAD
-	BOOL bUseDebugLogin = gSavedSettings.getBOOL("UseDebugLogin");
-#else
-	BOOL bUseDebugLogin = TRUE;
-#endif
-
-	LLPanelLogin::show(	gViewerWindow->getWindowRectScaled(),
-						bUseDebugLogin || gSavedSettings.getBOOL("SecondLifeEnterprise"),
-						login_callback, NULL );
-
-}
-
-// Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
-void login_callback(S32 option, void *userdata)
-{
-	const S32 CONNECT_OPTION = 0;
-	const S32 QUIT_OPTION = 1;
-
-	if (CONNECT_OPTION == option)
-	{
-		LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
-		return;
-	}
-	else if (QUIT_OPTION == option) // *TODO: THIS CODE SEEMS TO BE UNREACHABLE!!!!! login_callback is never called with option equal to QUIT_OPTION
-	{
-		if (!gSavedSettings.getBOOL("RememberPassword"))
-		{
-			// turn off the setting and write out to disk
-			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
-			LLUIColorTable::instance().saveUserSettings();
-		}
-
-		// Next iteration through main loop should shut down the app cleanly.
-		LLAppViewer::instance()->userQuit();
-		
-		if (LLAppViewer::instance()->quitRequested())
-		{
-			LLPanelLogin::closePanel();
-		}
-		return;
-	}
-	else
-	{
-		LL_WARNS("AppInit") << "Unknown login button clicked" << LL_ENDL;
-	}
-}
-
-void show_first_run_dialog()
-{
-	LLNotificationsUtil::add("FirstRun", LLSD(), LLSD(), first_run_dialog_callback);
-}
-
-bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-	if (0 == option)
-	{
-		LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
-		LLWeb::loadURLExternal(LLTrans::getString("create_account_url") );
-	}
-
-	LLPanelLogin::giveFocus();
-	return false;
-}
-
-
-
-void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)
-{
-	gViewerWindow->setProgressPercent(frac*100);
-	gViewerWindow->setProgressString(string);
-
-	gViewerWindow->setProgressMessage(msg);
-}
-
-bool login_alert_status(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    // Buttons
-    switch( option )
-    {
-        case 0:     // OK
-            break;
-      //  case 1:     // Help
-      //      LLWeb::loadURL(LLNotifications::instance().getGlobalString("SUPPORT_URL") );
-      //      break;
-        case 2:     // Teleport
-            // Restart the login process, starting at our home locaton
-	  LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME));
-            LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
-            break;
-        default:
-            LL_WARNS("AppInit") << "Missing case in login_alert_status switch" << LL_ENDL;
-    }
-
-	LLPanelLogin::giveFocus();
-	return false;
-}
-
-
-void use_circuit_callback(void**, S32 result)
-{
-	// bail if we're quitting.
-	if(LLApp::isExiting()) return;
-	if( !gUseCircuitCallbackCalled )
-	{
-		gUseCircuitCallbackCalled = true;
-		if (result)
-		{
-			// Make sure user knows something bad happened. JC
-			LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL;
-			LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);
-			reset_login();
-		}
-		else
-		{
-			gGotUseCircuitCodeAck = true;
-		}
-	}
-}
-
-void register_viewer_callbacks(LLMessageSystem* msg)
-{
-	msg->setHandlerFuncFast(_PREHASH_LayerData,				process_layer_data );
-	msg->setHandlerFuncFast(_PREHASH_ImageData,				LLViewerTextureList::receiveImageHeader );
-	msg->setHandlerFuncFast(_PREHASH_ImagePacket,				LLViewerTextureList::receiveImagePacket );
-	msg->setHandlerFuncFast(_PREHASH_ObjectUpdate,				process_object_update );
-	msg->setHandlerFunc("ObjectUpdateCompressed",				process_compressed_object_update );
-	msg->setHandlerFunc("ObjectUpdateCached",					process_cached_object_update );
-	msg->setHandlerFuncFast(_PREHASH_ImprovedTerseObjectUpdate, process_terse_object_update_improved );
-	msg->setHandlerFunc("SimStats",				process_sim_stats);
-	msg->setHandlerFuncFast(_PREHASH_HealthMessage,			process_health_message );
-	msg->setHandlerFuncFast(_PREHASH_EconomyData,				process_economy_data);
-	msg->setHandlerFunc("RegionInfo", LLViewerRegion::processRegionInfo);
-
-	msg->setHandlerFuncFast(_PREHASH_ChatFromSimulator,		process_chat_from_simulator);
-	msg->setHandlerFuncFast(_PREHASH_KillObject,				process_kill_object,	NULL);
-	msg->setHandlerFuncFast(_PREHASH_SimulatorViewerTimeMessage,	process_time_synch,		NULL);
-	msg->setHandlerFuncFast(_PREHASH_EnableSimulator,			process_enable_simulator);
-	msg->setHandlerFuncFast(_PREHASH_DisableSimulator,			process_disable_simulator);
-	msg->setHandlerFuncFast(_PREHASH_KickUser,					process_kick_user,		NULL);
-
-	msg->setHandlerFunc("CrossedRegion", process_crossed_region);
-	msg->setHandlerFuncFast(_PREHASH_TeleportFinish, process_teleport_finish);
-
-	msg->setHandlerFuncFast(_PREHASH_AlertMessage,             process_alert_message);
-	msg->setHandlerFunc("AgentAlertMessage", process_agent_alert_message);
-	msg->setHandlerFuncFast(_PREHASH_MeanCollisionAlert,             process_mean_collision_alert_message,  NULL);
-	msg->setHandlerFunc("ViewerFrozenMessage",             process_frozen_message);
-
-	msg->setHandlerFuncFast(_PREHASH_NameValuePair,			process_name_value);
-	msg->setHandlerFuncFast(_PREHASH_RemoveNameValuePair,	process_remove_name_value);
-	msg->setHandlerFuncFast(_PREHASH_AvatarAnimation,		process_avatar_animation);
-	msg->setHandlerFuncFast(_PREHASH_AvatarAppearance,		process_avatar_appearance);
-	msg->setHandlerFunc("AgentCachedTextureResponse",	LLAgent::processAgentCachedTextureResponse);
-	msg->setHandlerFunc("RebakeAvatarTextures", LLVOAvatarSelf::processRebakeAvatarTextures);
-	msg->setHandlerFuncFast(_PREHASH_CameraConstraint,		process_camera_constraint);
-	msg->setHandlerFuncFast(_PREHASH_AvatarSitResponse,		process_avatar_sit_response);
-	msg->setHandlerFunc("SetFollowCamProperties",			process_set_follow_cam_properties);
-	msg->setHandlerFunc("ClearFollowCamProperties",			process_clear_follow_cam_properties);
-
-	msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage,	process_improved_im);
-	msg->setHandlerFuncFast(_PREHASH_ScriptQuestion,			process_script_question);
-	msg->setHandlerFuncFast(_PREHASH_ObjectProperties,			LLSelectMgr::processObjectProperties, NULL);
-	msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily,	LLSelectMgr::processObjectPropertiesFamily, NULL);
-	msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect);
-
-	msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply,		process_money_balance_reply,	NULL);
-	msg->setHandlerFuncFast(_PREHASH_CoarseLocationUpdate,		LLWorld::processCoarseUpdate, NULL);
-	msg->setHandlerFuncFast(_PREHASH_ReplyTaskInventory, 		LLViewerObject::processTaskInv,	NULL);
-	msg->setHandlerFuncFast(_PREHASH_DerezContainer,			process_derez_container, NULL);
-	msg->setHandlerFuncFast(_PREHASH_ScriptRunningReply,
-						&LLLiveLSLEditor::processScriptRunningReply);
-
-	msg->setHandlerFuncFast(_PREHASH_DeRezAck, process_derez_ack);
-
-	msg->setHandlerFunc("LogoutReply", process_logout_reply);
-
-	//msg->setHandlerFuncFast(_PREHASH_AddModifyAbility,
-	//					&LLAgent::processAddModifyAbility);
-	//msg->setHandlerFuncFast(_PREHASH_RemoveModifyAbility,
-	//					&LLAgent::processRemoveModifyAbility);
-	msg->setHandlerFuncFast(_PREHASH_AgentDataUpdate,
-						&LLAgent::processAgentDataUpdate);
-	msg->setHandlerFuncFast(_PREHASH_AgentGroupDataUpdate,
-						&LLAgent::processAgentGroupDataUpdate);
-	msg->setHandlerFunc("AgentDropGroup",
-						&LLAgent::processAgentDropGroup);
-	// land ownership messages
-	msg->setHandlerFuncFast(_PREHASH_ParcelOverlay,
-						LLViewerParcelMgr::processParcelOverlay);
-	msg->setHandlerFuncFast(_PREHASH_ParcelProperties,
-						LLViewerParcelMgr::processParcelProperties);
-	msg->setHandlerFunc("ParcelAccessListReply",
-		LLViewerParcelMgr::processParcelAccessListReply);
-	msg->setHandlerFunc("ParcelDwellReply",
-		LLViewerParcelMgr::processParcelDwellReply);
-
-	msg->setHandlerFunc("AvatarPropertiesReply",
-						&LLAvatarPropertiesProcessor::processAvatarPropertiesReply);
-	msg->setHandlerFunc("AvatarInterestsReply",
-						&LLAvatarPropertiesProcessor::processAvatarInterestsReply);
-	msg->setHandlerFunc("AvatarGroupsReply",
-						&LLAvatarPropertiesProcessor::processAvatarGroupsReply);
-	// ratings deprecated
-	//msg->setHandlerFuncFast(_PREHASH_AvatarStatisticsReply,
-	//					LLPanelAvatar::processAvatarStatisticsReply);
-	msg->setHandlerFunc("AvatarNotesReply",
-						&LLAvatarPropertiesProcessor::processAvatarNotesReply);
-	msg->setHandlerFunc("AvatarPicksReply",
-						&LLAvatarPropertiesProcessor::processAvatarPicksReply);
- 	msg->setHandlerFunc("AvatarClassifiedReply",
- 						&LLAvatarPropertiesProcessor::processAvatarClassifiedsReply);
-
-	msg->setHandlerFuncFast(_PREHASH_CreateGroupReply,
-						LLGroupMgr::processCreateGroupReply);
-	msg->setHandlerFuncFast(_PREHASH_JoinGroupReply,
-						LLGroupMgr::processJoinGroupReply);
-	msg->setHandlerFuncFast(_PREHASH_EjectGroupMemberReply,
-						LLGroupMgr::processEjectGroupMemberReply);
-	msg->setHandlerFuncFast(_PREHASH_LeaveGroupReply,
-						LLGroupMgr::processLeaveGroupReply);
-	msg->setHandlerFuncFast(_PREHASH_GroupProfileReply,
-						LLGroupMgr::processGroupPropertiesReply);
-
-	// ratings deprecated
-	// msg->setHandlerFuncFast(_PREHASH_ReputationIndividualReply,
-	//					LLFloaterRate::processReputationIndividualReply);
-
-	msg->setHandlerFuncFast(_PREHASH_AgentWearablesUpdate,
-						LLAgentWearables::processAgentInitialWearablesUpdate );
-
-	msg->setHandlerFunc("ScriptControlChange",
-						LLAgent::processScriptControlChange );
-
-	msg->setHandlerFuncFast(_PREHASH_ViewerEffect, LLHUDManager::processViewerEffect);
-
-	msg->setHandlerFuncFast(_PREHASH_GrantGodlikePowers, process_grant_godlike_powers);
-
-	msg->setHandlerFuncFast(_PREHASH_GroupAccountSummaryReply,
-							LLPanelGroupLandMoney::processGroupAccountSummaryReply);
-	msg->setHandlerFuncFast(_PREHASH_GroupAccountDetailsReply,
-							LLPanelGroupLandMoney::processGroupAccountDetailsReply);
-	msg->setHandlerFuncFast(_PREHASH_GroupAccountTransactionsReply,
-							LLPanelGroupLandMoney::processGroupAccountTransactionsReply);
-
-	msg->setHandlerFuncFast(_PREHASH_UserInfoReply,
-		process_user_info_reply);
-
-	msg->setHandlerFunc("RegionHandshake", process_region_handshake, NULL);
-
-	msg->setHandlerFunc("TeleportStart", process_teleport_start );
-	msg->setHandlerFunc("TeleportProgress", process_teleport_progress);
-	msg->setHandlerFunc("TeleportFailed", process_teleport_failed, NULL);
-	msg->setHandlerFunc("TeleportLocal", process_teleport_local, NULL);
-
-	msg->setHandlerFunc("ImageNotInDatabase", LLViewerTextureList::processImageNotInDatabase, NULL);
-
-	msg->setHandlerFuncFast(_PREHASH_GroupMembersReply,
-						LLGroupMgr::processGroupMembersReply);
-	msg->setHandlerFunc("GroupRoleDataReply",
-						LLGroupMgr::processGroupRoleDataReply);
-	msg->setHandlerFunc("GroupRoleMembersReply",
-						LLGroupMgr::processGroupRoleMembersReply);
-	msg->setHandlerFunc("GroupTitlesReply",
-						LLGroupMgr::processGroupTitlesReply);
-	// Special handler as this message is sometimes used for group land.
-	msg->setHandlerFunc("PlacesReply", process_places_reply);
-	msg->setHandlerFunc("GroupNoticesListReply", LLPanelGroupNotices::processGroupNoticesListReply);
-
-	msg->setHandlerFunc("AvatarPickerReply", LLFloaterAvatarPicker::processAvatarPickerReply);
-
-	msg->setHandlerFunc("MapBlockReply", LLWorldMapMessage::processMapBlockReply);
-	msg->setHandlerFunc("MapItemReply", LLWorldMapMessage::processMapItemReply);
-	msg->setHandlerFunc("EventInfoReply", LLEventNotifier::processEventInfoReply);
-	
-	msg->setHandlerFunc("PickInfoReply", &LLAvatarPropertiesProcessor::processPickInfoReply);
-//	msg->setHandlerFunc("ClassifiedInfoReply", LLPanelClassified::processClassifiedInfoReply);
-	msg->setHandlerFunc("ClassifiedInfoReply", LLAvatarPropertiesProcessor::processClassifiedInfoReply);
-	msg->setHandlerFunc("ParcelInfoReply", LLRemoteParcelInfoProcessor::processParcelInfoReply);
-	msg->setHandlerFunc("ScriptDialog", process_script_dialog);
-	msg->setHandlerFunc("LoadURL", process_load_url);
-	msg->setHandlerFunc("ScriptTeleportRequest", process_script_teleport_request);
-	msg->setHandlerFunc("EstateCovenantReply", process_covenant_reply);
-
-	// calling cards
-	msg->setHandlerFunc("OfferCallingCard", process_offer_callingcard);
-	msg->setHandlerFunc("AcceptCallingCard", process_accept_callingcard);
-	msg->setHandlerFunc("DeclineCallingCard", process_decline_callingcard);
-
-	msg->setHandlerFunc("ParcelObjectOwnersReply", LLPanelLandObjects::processParcelObjectOwnersReply);
-
-	msg->setHandlerFunc("InitiateDownload", process_initiate_download);
-	msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply);
-	msg->setHandlerFunc("GenericMessage", process_generic_message);
-
-	msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);
-}
-
-void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)
-{
-	// nothing
-}
-
-// *HACK: Must match name in Library or agent inventory
-const std::string ROOT_GESTURES_FOLDER = "Gestures";
-const std::string COMMON_GESTURES_FOLDER = "Common Gestures";
-const std::string MALE_GESTURES_FOLDER = "Male Gestures";
-const std::string FEMALE_GESTURES_FOLDER = "Female Gestures";
-const std::string SPEECH_GESTURES_FOLDER = "Speech Gestures";
-const std::string OTHER_GESTURES_FOLDER = "Other Gestures";
-const S32 OPT_CLOSED_WINDOW = -1;
-const S32 OPT_MALE = 0;
-const S32 OPT_FEMALE = 1;
-const S32 OPT_TRUST_CERT = 0;
-const S32 OPT_CANCEL_TRUST = 1;
-	
-bool callback_choose_gender(const LLSD& notification, const LLSD& response)
-{
-	
-    // These defaults are returned from the server on login.  They are set in login.xml.                  
-    // If no default is returned from the server, they are retrieved from settings.xml.                   
-	
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	switch(option)
-	{
-		case OPT_MALE:
-			LLStartUp::loadInitialOutfit( gSavedSettings.getString("DefaultMaleAvatar"), "male" );
-			break;
-			
-        case OPT_FEMALE:
-        case OPT_CLOSED_WINDOW:
-        default:
-			LLStartUp::loadInitialOutfit( gSavedSettings.getString("DefaultFemaleAvatar"), "female" );
-			break;
-	}
-	return false;
-}
-
-void LLStartUp::copyLibraryGestures(const std::string& same_gender_gestures)
-{
-	llinfos << "Copying library gestures" << llendl;
-
-	// Copy gestures
-	LLUUID lib_gesture_cat_id =
-		gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE,false,true);
-	if (lib_gesture_cat_id.isNull())
-	{
-		llwarns << "Unable to copy gestures, source category not found" << llendl;
-	}
-	LLUUID dst_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE);
-
-	std::vector<std::string> gesture_folders_to_copy;
-	gesture_folders_to_copy.push_back(MALE_GESTURES_FOLDER);
-	gesture_folders_to_copy.push_back(FEMALE_GESTURES_FOLDER);
-	gesture_folders_to_copy.push_back(COMMON_GESTURES_FOLDER);
-	gesture_folders_to_copy.push_back(SPEECH_GESTURES_FOLDER);
-	gesture_folders_to_copy.push_back(OTHER_GESTURES_FOLDER);
-
-	for(std::vector<std::string>::iterator it = gesture_folders_to_copy.begin();
-		it != gesture_folders_to_copy.end();
-		++it)
-	{
-		std::string& folder_name = *it;
-
-		LLPointer<LLInventoryCallback> cb(NULL);
-
-		if (folder_name == same_gender_gestures ||
-			folder_name == COMMON_GESTURES_FOLDER ||
-			folder_name == OTHER_GESTURES_FOLDER)
-		{
-			cb = new ActivateGestureCallback;
-		}
-
-
-		LLUUID cat_id = findDescendentCategoryIDByName(lib_gesture_cat_id,folder_name);
-		if (cat_id.isNull())
-		{
-			llwarns << "failed to find gesture folder for " << folder_name << llendl;
-		}
-		else
-		{
-			llinfos << "initiating fetch and copy for " << folder_name << " cat_id " << cat_id << llendl;
-			LLAppearanceMgr* app_mgr = LLAppearanceMgr::getInstance();
-			callAfterCategoryFetch(cat_id,
-								   boost::bind(&LLAppearanceMgr::shallowCopyCategory,
-											   app_mgr,
-											   cat_id,
-											   dst_id,
-											   cb));
-		}
-	}
-}
-
-void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
-								   const std::string& gender_name )
-{
-	llinfos << "starting" << llendl;
-
-	// Not going through the processAgentInitialWearables path, so need to set this here.
-	LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true);
-	// Initiate creation of COF, since we're also bypassing that.
-	gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
-	
-	S32 gender = 0;
-	std::string same_gender_gestures;
-	if (gender_name == "male")
-	{
-		gender = OPT_MALE;
-		same_gender_gestures = MALE_GESTURES_FOLDER;
-	}
-	else
-	{
-		gender = OPT_FEMALE;
-		same_gender_gestures = FEMALE_GESTURES_FOLDER;
-	}
-
-	// try to find the outfit - if not there, create some default
-	// wearables.
-	LLUUID cat_id = findDescendentCategoryIDByName(
-		gInventory.getLibraryRootFolderID(),
-		outfit_folder_name);
-	if (cat_id.isNull())
-	{
-		gAgentWearables.createStandardWearables(gender);
-	}
-	else
-	{
-		sWearablesLoadedCon = gAgentWearables.addLoadedCallback(LLStartUp::saveInitialOutfit);
-
-		bool do_copy = true;
-		bool do_append = false;
-		LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
-		LLAppearanceMgr::instance().wearInventoryCategory(cat, do_copy, do_append);
-	}
-
-	// Copy gestures
-	copyLibraryGestures(same_gender_gestures);
-	
-	// This is really misnamed -- it means we have started loading
-	// an outfit/shape that will give the avatar a gender eventually. JC
-	gAgent.setGenderChosen(TRUE);
-
-}
-
-//static
-void LLStartUp::saveInitialOutfit()
-{
-	if (sInitialOutfit.empty()) return;
-	
-	if (sWearablesLoadedCon.connected())
-	{
-		sWearablesLoadedCon.disconnect();
-	}
-	LLAppearanceMgr::getInstance()->makeNewOutfitLinks(sInitialOutfit,false);
-}
-
-std::string& LLStartUp::getInitialOutfitName()
-{
-	return sInitialOutfit;
-}
-
-// Loads a bitmap to display during load
-void init_start_screen(S32 location_id)
-{
-	if (gStartTexture.notNull())
-	{
-		gStartTexture = NULL;
-		LL_INFOS("AppInit") << "re-initializing start screen" << LL_ENDL;
-	}
-
-	LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;
-
-	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-
-	if ((S32)START_LOCATION_ID_LAST == location_id)
-	{
-		temp_str += SCREEN_LAST_FILENAME;
-	}
-	else
-	{
-		temp_str += SCREEN_HOME_FILENAME;
-	}
-
-	LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP;
-	
-	// Turn off start screen to get around the occasional readback 
-	// driver bug
-	if(!gSavedSettings.getBOOL("UseStartScreen"))
-	{
-		LL_INFOS("AppInit")  << "Bitmap load disabled" << LL_ENDL;
-		return;
-	}
-	else if(!start_image_bmp->load(temp_str) )
-	{
-		LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;
-		return;
-	}
-
-	gStartImageWidth = start_image_bmp->getWidth();
-	gStartImageHeight = start_image_bmp->getHeight();
-
-	LLPointer<LLImageRaw> raw = new LLImageRaw;
-	if (!start_image_bmp->decode(raw, 0.0f))
-	{
-		LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;
-		gStartTexture = NULL;
-		return;
-	}
-
-	raw->expandToPowerOfTwo();
-	gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE) ;
-}
-
-
-// frees the bitmap
-void release_start_screen()
-{
-	LL_DEBUGS("AppInit") << "Releasing bitmap..." << LL_ENDL;
-	gStartTexture = NULL;
-}
-
-
-// static
-std::string LLStartUp::startupStateToString(EStartupState state)
-{
-#define RTNENUM(E) case E: return #E
-	switch(state){
-		RTNENUM( STATE_FIRST );
-		RTNENUM( STATE_BROWSER_INIT );
-		RTNENUM( STATE_LOGIN_SHOW );
-		RTNENUM( STATE_LOGIN_WAIT );
-		RTNENUM( STATE_LOGIN_CLEANUP );
-		RTNENUM( STATE_LOGIN_AUTH_INIT );
-		RTNENUM( STATE_LOGIN_CURL_UNSTUCK );
-		RTNENUM( STATE_LOGIN_PROCESS_RESPONSE );
-		RTNENUM( STATE_WORLD_INIT );
-		RTNENUM( STATE_MULTIMEDIA_INIT );
-		RTNENUM( STATE_FONT_INIT );
-		RTNENUM( STATE_SEED_GRANTED_WAIT );
-		RTNENUM( STATE_SEED_CAP_GRANTED );
-		RTNENUM( STATE_WORLD_WAIT );
-		RTNENUM( STATE_AGENT_SEND );
-		RTNENUM( STATE_AGENT_WAIT );
-		RTNENUM( STATE_INVENTORY_SEND );
-		RTNENUM( STATE_MISC );
-		RTNENUM( STATE_PRECACHE );
-		RTNENUM( STATE_WEARABLES_WAIT );
-		RTNENUM( STATE_CLEANUP );
-		RTNENUM( STATE_STARTED );
-	default:
-		return llformat("(state #%d)", state);
-	}
-#undef RTNENUM
-}
-
-// static
-void LLStartUp::setStartupState( EStartupState state )
-{
-	LL_INFOS("AppInit") << "Startup state changing from " <<  
-		getStartupStateString() << " to " <<  
-		startupStateToString(state) << LL_ENDL;
-	gStartupState = state;
-	postStartupState();
-}
-
-void LLStartUp::postStartupState()
-{
-	LLSD stateInfo;
-	stateInfo["str"] = getStartupStateString();
-	stateInfo["enum"] = gStartupState;
-	sStateWatcher->post(stateInfo);
-}
-
-
-void reset_login()
-{
-	gAgentWearables.cleanup();
-	gAgentCamera.cleanup();
-	gAgent.cleanup();
-	LLWorld::getInstance()->destroyClass();
-
-	LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-
-	if ( gViewerWindow )
-	{	// Hide menus and normal buttons
-		gViewerWindow->setNormalControlsVisible( FALSE );
-		gLoginMenuBarView->setVisible( TRUE );
-		gLoginMenuBarView->setEnabled( TRUE );
-	}
-
-	// Hide any other stuff
-	LLFloaterReg::hideVisibleInstances();
-}
-
-//---------------------------------------------------------------------------
-
-// Initialize all plug-ins except the web browser (which was initialized
-// early, before the login screen). JC
-void LLStartUp::multimediaInit()
-{
-	LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
-	std::string msg = LLTrans::getString("LoginInitializingMultimedia");
-	set_startup_status(0.42f, msg.c_str(), gAgent.mMOTD.c_str());
-	display_startup();
-
-	// LLViewerMedia::initClass();
-	LLViewerParcelMedia::initClass();
-}
-
-void LLStartUp::fontInit()
-{
-	LL_DEBUGS("AppInit") << "Initializing fonts...." << LL_ENDL;
-	std::string msg = LLTrans::getString("LoginInitializingFonts");
-	set_startup_status(0.45f, msg.c_str(), gAgent.mMOTD.c_str());
-	display_startup();
-
-	LLFontGL::loadDefaultFonts();
-}
-
-void LLStartUp::initNameCache()
-{
-	// Can be called multiple times
-	if ( gCacheName ) return;
-
-	gCacheName = new LLCacheName(gMessageSystem);
-	gCacheName->addObserver(&callback_cache_name);
-	gCacheName->localizeCacheName("waiting", LLTrans::getString("AvatarNameWaiting"));
-	gCacheName->localizeCacheName("nobody", LLTrans::getString("AvatarNameNobody"));
-	gCacheName->localizeCacheName("none", LLTrans::getString("GroupNameNone"));
-	// Load stored cache if possible
-	LLAppViewer::instance()->loadNameCache();
-
-	// Start cache in not-running state until we figure out if we have
-	// capabilities for display name lookup
-	LLAvatarNameCache::initClass(false);
-	LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));
-}
-
-void LLStartUp::cleanupNameCache()
-{
-	LLAvatarNameCache::cleanupClass();
-
-	delete gCacheName;
-	gCacheName = NULL;
-}
-
-bool LLStartUp::dispatchURL()
-{
-	// ok, if we've gotten this far and have a startup URL
-        if (!getStartSLURL().isValid())
-	{
-	  return false;
-	}
-        if(getStartSLURL().getType() != LLSLURL::APP)
-	  {
-	    
-		// If we started with a location, but we're already
-		// at that location, don't pop dialogs open.
-		LLVector3 pos = gAgent.getPositionAgent();
-		LLVector3 slurlpos = getStartSLURL().getPosition();
-		F32 dx = pos.mV[VX] - slurlpos.mV[VX];
-		F32 dy = pos.mV[VY] - slurlpos.mV[VY];
-		const F32 SLOP = 2.f;	// meters
-
-		if( getStartSLURL().getRegion() != gAgent.getRegion()->getName()
-			|| (dx*dx > SLOP*SLOP)
-			|| (dy*dy > SLOP*SLOP) )
-		{
-			LLURLDispatcher::dispatch(getStartSLURL().getSLURLString(), 
-						  NULL, false);
-		}
-		return true;
-	}
-	return false;
-}
-
-void LLStartUp::setStartSLURL(const LLSLURL& slurl) 
-{
-  sStartSLURL = slurl;
-  switch(slurl.getType())
-    {
-    case LLSLURL::HOME_LOCATION:
-      {
-		  gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_HOME);
-	break;
-      }
-    case LLSLURL::LAST_LOCATION:
-      {
-	gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_LAST);
-	break;
-      }
-    default:
-			LLGridManager::getInstance()->setGridChoice(slurl.getGrid());
-			break;
-    }
-}
-
-bool login_alert_done(const LLSD& notification, const LLSD& response)
-{
-	LLPanelLogin::giveFocus();
-	return false;
-}
-
-// parse the certificate information into args for the 
-// certificate notifications
-LLSD transform_cert_args(LLPointer<LLCertificate> cert)
-{
-	LLSD args = LLSD::emptyMap();
-	std::string value;
-	LLSD cert_info;
-	cert->getLLSD(cert_info);
-	// convert all of the elements in the cert into                                        
-	// args for the xml dialog, so we have flexability to                                  
-	// display various parts of the cert by only modifying                                 
-	// the cert alert dialog xml.                                                          
-	for(LLSD::map_iterator iter = cert_info.beginMap();
-		iter != cert_info.endMap();
-		iter++)
-	{
-		// key usage and extended key usage                                            
-		// are actually arrays, and we want to format them as comma separated          
-		// strings, so special case those.                                             
-		LLSDSerialize::toXML(cert_info[iter->first], std::cout);
-		if((iter->first== std::string(CERT_KEY_USAGE)) |
-		   (iter->first == std::string(CERT_EXTENDED_KEY_USAGE)))
-		{
-			value = "";
-			LLSD usage = cert_info[iter->first];
-			for (LLSD::array_iterator usage_iter = usage.beginArray();
-				 usage_iter != usage.endArray();
-				 usage_iter++)
-			{
-				
-				if(usage_iter != usage.beginArray())
-				{
-					value += ", ";
-				}
-				
-				value += (*usage_iter).asString();
-			}
-			
-		}
-		else
-		{
-			value = iter->second.asString();
-		}
-		
-		std::string name = iter->first;
-		std::transform(name.begin(), name.end(), name.begin(),
-					   (int(*)(int))toupper);
-		args[name.c_str()] = value;
-	}
-	return args;
-}
-
-
-// when we handle a cert error, give focus back to the login panel
-void general_cert_done(const LLSD& notification, const LLSD& response)
-{
-	LLStartUp::setStartupState( STATE_LOGIN_SHOW );			
-	LLPanelLogin::giveFocus();
-}
-
-// check to see if the user wants to trust the cert.
-// if they do, add it to the cert store and 
-void trust_cert_done(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);	
-	switch(option)
-	{
-		case OPT_TRUST_CERT:
-		{
-			LLPointer<LLCertificate> cert = gSecAPIHandler->getCertificate(notification["payload"]["certificate"]);
-			LLPointer<LLCertificateStore> store = gSecAPIHandler->getCertificateStore(gSavedSettings.getString("CertStore"));			
-			store->add(cert);
-			store->save();
-			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );	
-			break;
-		}
-		case OPT_CANCEL_TRUST:
-			reset_login();
-			gSavedSettings.setBOOL("AutoLogin", FALSE);			
-			LLStartUp::setStartupState( STATE_LOGIN_SHOW );				
-		default:
-			LLPanelLogin::giveFocus();
-			break;
-	}
-
-}
-
-void apply_udp_blacklist(const std::string& csv)
-{
-
-	std::string::size_type start = 0;
-	std::string::size_type comma = 0;
-	do 
-	{
-		comma = csv.find(",", start);
-		if (comma == std::string::npos)
-		{
-			comma = csv.length();
-		}
-		std::string item(csv, start, comma-start);
-
-		lldebugs << "udp_blacklist " << item << llendl;
-		gMessageSystem->banUdpMessage(item);
-		
-		start = comma + 1;
-
-	}
-	while(comma < csv.length());
-	
-}
-
-bool process_login_success_response()
-{
-	LLSD response = LLLoginInstance::getInstance()->getResponse();
-
-	std::string text(response["udp_blacklist"]);
-	if(!text.empty())
-	{
-		apply_udp_blacklist(text);
-	}
-
-	// unpack login data needed by the application
-	text = response["agent_id"].asString();
-	if(!text.empty()) gAgentID.set(text);
-	gDebugInfo["AgentID"] = text;
-	
-	// Agent id needed for parcel info request in LLUrlEntryParcel
-	// to resolve parcel name.
-	LLUrlEntryParcel::setAgentID(gAgentID);
-
-	text = response["session_id"].asString();
-	if(!text.empty()) gAgentSessionID.set(text);
-	gDebugInfo["SessionID"] = text;
-
-	// Session id needed for parcel info request in LLUrlEntryParcel
-	// to resolve parcel name.
-	LLUrlEntryParcel::setSessionID(gAgentSessionID);
-	
-	text = response["secure_session_id"].asString();
-	if(!text.empty()) gAgent.mSecureSessionID.set(text);
-
-	// if the response contains a display name, use that,
-	// otherwise if the response contains a first and/or last name,
-	// use those.  Otherwise use the credential identifier
-
-	gDisplayName = "";
-	if (response.has("display_name"))
-	{
-		gDisplayName.assign(response["display_name"].asString());
-		if(!gDisplayName.empty())
-		{
-			// Remove quotes from string.  Login.cgi sends these to force
-			// names that look like numbers into strings.
-			LLStringUtil::replaceChar(gDisplayName, '"', ' ');
-			LLStringUtil::trim(gDisplayName);
-		}
-	}
-	if(gDisplayName.empty())
-	{
-		if(response.has("first_name"))
-		{
-			gDisplayName.assign(response["first_name"].asString());
-			LLStringUtil::replaceChar(gDisplayName, '"', ' ');
-			LLStringUtil::trim(gDisplayName);
-		}
-		if(response.has("last_name"))
-		{
-			text.assign(response["last_name"].asString());
-			LLStringUtil::replaceChar(text, '"', ' ');
-			LLStringUtil::trim(text);
-			if(!gDisplayName.empty())
-			{
-				gDisplayName += " ";
-			}
-			gDisplayName += text;
-		}
-	}
-	if(gDisplayName.empty())
-	{
-		gDisplayName.assign(gUserCredential->asString());
-	}
-
-	// this is their actual ability to access content
-	text = response["agent_access_max"].asString();
-	if (!text.empty())
-	{
-		// agent_access can be 'A', 'M', and 'PG'.
-		gAgent.setMaturity(text[0]);
-	}
-	
-	// this is the value of their preference setting for that content
-	// which will always be <= agent_access_max
-	text = response["agent_region_access"].asString();
-	if (!text.empty())
-	{
-		U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]);
-
-		gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
-	}
-	// During the AO transition, this flag will be true. Then the flag will
-	// go away. After the AO transition, this code and all the code that
-	// uses it can be deleted.
-	text = response["ao_transition"].asString();
-	if (!text.empty())
-	{
-		if (text == "1")
-		{
-			gAgent.setAOTransition();
-		}
-	}
-
-	text = response["start_location"].asString();
-	if(!text.empty()) 
-	{
-		gAgentStartLocation.assign(text);
-	}
-
-	text = response["circuit_code"].asString();
-	if(!text.empty())
-	{
-		gMessageSystem->mOurCircuitCode = strtoul(text.c_str(), NULL, 10);
-	}
-	std::string sim_ip_str = response["sim_ip"];
-	std::string sim_port_str = response["sim_port"];
-	if(!sim_ip_str.empty() && !sim_port_str.empty())
-	{
-		U32 sim_port = strtoul(sim_port_str.c_str(), NULL, 10);
-		gFirstSim.set(sim_ip_str, sim_port);
-		if (gFirstSim.isOk())
-		{
-			gMessageSystem->enableCircuit(gFirstSim, TRUE);
-		}
-	}
-	std::string region_x_str = response["region_x"];
-	std::string region_y_str = response["region_y"];
-	if(!region_x_str.empty() && !region_y_str.empty())
-	{
-		U32 region_x = strtoul(region_x_str.c_str(), NULL, 10);
-		U32 region_y = strtoul(region_y_str.c_str(), NULL, 10);
-		gFirstSimHandle = to_region_handle(region_x, region_y);
-	}
-	
-	const std::string look_at_str = response["look_at"];
-	if (!look_at_str.empty())
-	{
-		size_t len = look_at_str.size();
-		LLMemoryStream mstr((U8*)look_at_str.c_str(), len);
-		LLSD sd = LLSDSerialize::fromNotation(mstr, len);
-		gAgentStartLookAt = ll_vector3_from_sd(sd);
-	}
-
-	text = response["seed_capability"].asString();
-	if (!text.empty()) gFirstSimSeedCap = text;
-				
-	text = response["seconds_since_epoch"].asString();
-	if(!text.empty())
-	{
-		U32 server_utc_time = strtoul(text.c_str(), NULL, 10);
-		if(server_utc_time)
-		{
-			time_t now = time(NULL);
-			gUTCOffset = (server_utc_time - now);
-		}
-	}
-
-	// this is the base used to construct help URLs
-	text = response["help_url_format"].asString();
-	if (!text.empty())
-	{
-		// replace the default help URL format
-		gSavedSettings.setString("HelpURLFormat",text);
-		
-		// don't fall back to Standalone's pre-connection static help
-		gSavedSettings.setBOOL("HelpUseLocal", false);
-	}
-			
-	std::string home_location = response["home"];
-	if(!home_location.empty())
-	{
-		size_t len = home_location.size();
-		LLMemoryStream mstr((U8*)home_location.c_str(), len);
-		LLSD sd = LLSDSerialize::fromNotation(mstr, len);
-		S32 region_x = sd["region_handle"][0].asInteger();
-		S32 region_y = sd["region_handle"][1].asInteger();
-		U64 region_handle = to_region_handle(region_x, region_y);
-		LLVector3 position = ll_vector3_from_sd(sd["position"]);
-		gAgent.setHomePosRegion(region_handle, position);
-	}
-
-	gAgent.mMOTD.assign(response["message"]);
-
-	// Options...
-	// Each 'option' is an array of submaps. 
-	// It appears that we only ever use the first element of the array.
-	LLUUID inv_root_folder_id = response["inventory-root"][0]["folder_id"];
-	if(inv_root_folder_id.notNull())
-	{
-		gInventory.setRootFolderID(inv_root_folder_id);
-		//gInventory.mock(gAgent.getInventoryRootID());
-	}
-
-	LLSD login_flags = response["login-flags"][0];
-	if(login_flags.size())
-	{
-		std::string flag = login_flags["ever_logged_in"];
-		if(!flag.empty())
-		{
-			gAgent.setFirstLogin((flag == "N") ? TRUE : FALSE);
-		}
-
-		/*  Flag is currently ignored by the viewer.
-		flag = login_flags["stipend_since_login"];
-		if(flag == "Y") 
-		{
-			stipend_since_login = true;
-		}
-		*/
-
-		flag = login_flags["gendered"].asString();
-		if(flag == "Y")
-		{
-			gAgent.setGenderChosen(TRUE);
-		}
-		
-		bool pacific_daylight_time = false;
-		flag = login_flags["daylight_savings"].asString();
-		if(flag == "Y")
-		{
-			pacific_daylight_time = (flag == "Y");
-		}
-
-		//setup map of datetime strings to codes and slt & local time offset from utc
-		LLStringOps::setupDatetimeInfo(pacific_daylight_time);
-	}
-
-	// set up the voice configuration.  Ultimately, we should pass this up as part of each voice
-	// channel if we need to move to multiple voice servers per grid.
-	LLSD voice_config_info = response["voice-config"];
-	if(voice_config_info.has("VoiceServerType"))
-	{
-		gSavedSettings.setString("VoiceServerType", voice_config_info["VoiceServerType"].asString()); 
-	}
-
-	// Request the map server url
-	std::string map_server_url = response["map-server-url"];
-	if(!map_server_url.empty())
-	{
-		// We got an answer from the grid -> use that for map for the current session
-		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 
-		LL_INFOS("LLStartup") << "map-server-url : we got an answer from the grid : " << map_server_url << LL_ENDL;
-	}
-	else
-	{
-		// No answer from the grid -> use the default setting for current session 
-		map_server_url = gSavedSettings.getString("MapServerURL"); 
-		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 
-		LL_INFOS("LLStartup") << "map-server-url : no map-server-url answer, we use the default setting for the map : " << map_server_url << LL_ENDL;
-	}
-	
-	// Default male and female avatars allowing the user to choose their avatar on first login.
-	// These may be passed up by SLE to allow choice of enterprise avatars instead of the standard
-	// "new ruth."  Not to be confused with 'initial-outfit' below 
-	LLSD newuser_config = response["newuser-config"][0];
-	if(newuser_config.has("DefaultFemaleAvatar"))
-	{
-		gSavedSettings.setString("DefaultFemaleAvatar", newuser_config["DefaultFemaleAvatar"].asString()); 		
-	}
-	if(newuser_config.has("DefaultMaleAvatar"))
-	{
-		gSavedSettings.setString("DefaultMaleAvatar", newuser_config["DefaultMaleAvatar"].asString()); 		
-	}
-	
-	// Initial outfit for the user.
-	// QUESTION: Why can't we simply simply set the users outfit directly
-	// from a web page into the user info on the server? - Roxie
-	LLSD initial_outfit = response["initial-outfit"][0];
-	if(initial_outfit.size())
-	{
-		std::string flag = initial_outfit["folder_name"];
-		if(!flag.empty())
-		{
-			// Initial outfit is a folder in your inventory,
-			// must be an exact folder-name match.
-			sInitialOutfit = flag;
-		}
-
-		flag = initial_outfit["gender"].asString();
-		if(!flag.empty())
-		{
-			sInitialOutfitGender = flag;
-		}
-	}
-
-	LLSD global_textures = response["global-textures"][0];
-	if(global_textures.size())
-	{
-		// Extract sun and moon texture IDs.  These are used
-		// in the LLVOSky constructor, but I can't figure out
-		// how to pass them in.  JC
-		LLUUID id = global_textures["sun_texture_id"];
-		if(id.notNull())
-		{
-			gSunTextureID = id;
-		}
-
-		id = global_textures["moon_texture_id"];
-		if(id.notNull())
-		{
-			gMoonTextureID = id;
-		}
-
-		id = global_textures["cloud_texture_id"];
-		if(id.notNull())
-		{
-			gCloudTextureID = id;
-		}
-	}
-
-	// Set the location of the snapshot sharing config endpoint
-	std::string snapshot_config_url = response["snapshot_config_url"];
-	if(!snapshot_config_url.empty())
-	{
-		gSavedSettings.setString("SnapshotConfigURL", snapshot_config_url);
-	}
-
-	// Start the process of fetching the OpenID session cookie for this user login
-	std::string openid_url = response["openid_url"];
-	if(!openid_url.empty())
-	{
-		std::string openid_token = response["openid_token"];
-		LLViewerMedia::openIDSetup(openid_url, openid_token);
-	}
-
-	if(response.has("max-agent-groups")) {		
-		std::string max_agent_groups(response["max-agent-groups"]);
-		gMaxAgentGroups = atoi(max_agent_groups.c_str());
-		LL_INFOS("LLStartup") << "gMaxAgentGroups read from login.cgi: "
-							  << gMaxAgentGroups << LL_ENDL;
-	}
-	else {
-		gMaxAgentGroups = DEFAULT_MAX_AGENT_GROUPS;
-		LL_INFOS("LLStartup") << "using gMaxAgentGroups default: "
-							  << gMaxAgentGroups << LL_ENDL;
-	}
-		
-	bool success = false;
-	// JC: gesture loading done below, when we have an asset system
-	// in place.  Don't delete/clear gUserCredentials until then.
-	if(gAgentID.notNull()
-	   && gAgentSessionID.notNull()
-	   && gMessageSystem->mOurCircuitCode
-	   && gFirstSim.isOk()
-	   && gInventory.getRootFolderID().notNull())
-	{
-		success = true;
-	}
-
-	return success;
-}
-
-void transition_back_to_login_panel(const std::string& emsg)
-{
-	if (gNoRender)
-	{
-		LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;
-		LL_WARNS("AppInit") << emsg << LL_ENDL;
-		exit(0);
-	}
-
-	// Bounce back to the login screen.
-	reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-	gSavedSettings.setBOOL("AutoLogin", FALSE);
-}
+/** 

+ * @file llstartup.cpp

+ * @brief startup routines.

+ *

+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ * 

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ * 

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ * 

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ * 

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llstartup.h"

+

+#if LL_WINDOWS

+#	include <process.h>		// _spawnl()

+#else

+#	include <sys/stat.h>		// mkdir()

+#endif

+

+#include "llviewermedia_streamingaudio.h"

+#include "llaudioengine.h"

+

+#ifdef LL_FMOD

+# include "llaudioengine_fmod.h"

+#endif

+

+#ifdef LL_OPENAL

+#include "llaudioengine_openal.h"

+#endif

+

+#include "llares.h"

+#include "llavatarnamecache.h"

+#include "lllandmark.h"

+#include "llcachename.h"

+#include "lldir.h"

+#include "llerrorcontrol.h"

+#include "llfloaterreg.h"

+#include "llfocusmgr.h"

+#include "llhttpsender.h"

+#include "llimfloater.h"

+#include "lllocationhistory.h"

+#include "llimageworker.h"

+

+#include "llloginflags.h"

+#include "llmd5.h"

+#include "llmemorystream.h"

+#include "llmessageconfig.h"

+#include "llmoveview.h"

+#include "llnearbychat.h"

+#include "llnotifications.h"

+#include "llnotificationsutil.h"

+#include "llteleporthistory.h"

+#include "llregionhandle.h"

+#include "llsd.h"

+#include "llsdserialize.h"

+#include "llsdutil_math.h"

+#include "llsecondlifeurls.h"

+#include "llstring.h"

+#include "lluserrelations.h"

+#include "llversioninfo.h"

+#include "llviewercontrol.h"

+#include "llvfs.h"

+#include "llxorcipher.h"	// saved password, MAC address

+#include "llwindow.h"

+#include "imageids.h"

+#include "message.h"

+#include "v3math.h"

+

+#include "llagent.h"

+#include "llagentcamera.h"

+#include "llagentpicksinfo.h"

+#include "llagentwearables.h"

+#include "llagentpilot.h"

+#include "llfloateravatarpicker.h"

+#include "llcallbacklist.h"

+#include "llcallingcard.h"

+#include "llconsole.h"

+#include "llcontainerview.h"

+#include "lldebugview.h"

+#include "lldrawable.h"

+#include "lleventnotifier.h"

+#include "llface.h"

+#include "llfeaturemanager.h"

+//#include "llfirstuse.h"

+#include "llfloaterhud.h"

+#include "llfloaterland.h"

+#include "llfloaterpreference.h"

+#include "llfloatertopobjects.h"

+#include "llfloaterworldmap.h"

+#include "llgesturemgr.h"

+#include "llgroupmgr.h"

+#include "llhudeffecttrail.h"

+#include "llhudmanager.h"

+#include "llhttpclient.h"

+#include "llimagebmp.h"

+#include "llinventorybridge.h"

+#include "llinventorymodel.h"

+#include "llinventorymodelbackgroundfetch.h"

+#include "llkeyboard.h"

+#include "llloginhandler.h"			// gLoginHandler, SLURL support

+#include "lllogininstance.h" // Host the login module.

+#include "llpanellogin.h"

+#include "llmutelist.h"

+#include "llavatarpropertiesprocessor.h"

+#include "llpanelclassified.h"

+#include "llpanelpick.h"

+#include "llpanelgrouplandmoney.h"

+#include "llpanelgroupnotices.h"

+#include "llpreview.h"

+#include "llpreviewscript.h"

+#include "llproductinforequest.h"

+#include "llsecondlifeurls.h"

+#include "llselectmgr.h"

+#include "llsky.h"

+#include "llsidetray.h"

+#include "llstatview.h"

+#include "llstatusbar.h"		// sendMoneyBalanceRequest(), owns L$ balance

+#include "llsurface.h"

+#include "lltexturecache.h"

+#include "lltexturefetch.h"

+#include "lltoolmgr.h"

+#include "lltrans.h"

+#include "llui.h"

+#include "llurldispatcher.h"

+#include "llurlentry.h"

+#include "llslurl.h"

+#include "llurlhistory.h"

+#include "llurlwhitelist.h"

+#include "llvieweraudio.h"

+#include "llviewerassetstorage.h"

+#include "llviewercamera.h"

+#include "llviewerdisplay.h"

+#include "llviewergenericmessage.h"

+#include "llviewergesture.h"

+#include "llviewertexturelist.h"

+#include "llviewermedia.h"

+#include "llviewermenu.h"

+#include "llviewermessage.h"

+#include "llviewernetwork.h"

+#include "llviewerobjectlist.h"

+#include "llviewerparcelmedia.h"

+#include "llviewerparcelmgr.h"

+#include "llviewerregion.h"

+#include "llviewerstats.h"

+#include "llviewerthrottle.h"

+#include "llviewerwindow.h"

+#include "llvoavatar.h"

+#include "llvoavatarself.h"

+#include "llvoclouds.h"

+#include "llweb.h"

+#include "llworld.h"

+#include "llworldmapmessage.h"

+#include "llxfermanager.h"

+#include "pipeline.h"

+#include "llappviewer.h"

+#include "llfasttimerview.h"

+#include "llfloatermap.h"

+#include "llweb.h"

+#include "llvoiceclient.h"

+#include "llnamelistctrl.h"

+#include "llnamebox.h"

+#include "llnameeditor.h"

+#include "llpostprocess.h"

+#include "llwlparammanager.h"

+#include "llwaterparammanager.h"

+#include "llagentlanguage.h"

+#include "llwearable.h"

+#include "llinventorybridge.h"

+#include "llappearancemgr.h"

+#include "llavatariconctrl.h"

+#include "llvoicechannel.h"

+

+#include "lllogin.h"

+#include "llevents.h"

+#include "llstartuplistener.h"

+

+#if LL_WINDOWS

+#include "lldxhardware.h"

+#endif

+

+//

+// exported globals

+//

+bool gAgentMovementCompleted = false;

+S32  gMaxAgentGroups;

+

+std::string SCREEN_HOME_FILENAME = "screen_home.bmp";

+std::string SCREEN_LAST_FILENAME = "screen_last.bmp";

+

+LLPointer<LLViewerTexture> gStartTexture;

+

+//

+// Imported globals

+//

+extern S32 gStartImageWidth;

+extern S32 gStartImageHeight;

+

+//

+// local globals

+//

+static bool gGotUseCircuitCodeAck = false;

+static std::string sInitialOutfit;

+static std::string sInitialOutfitGender;	// "male" or "female"

+static boost::signals2::connection sWearablesLoadedCon;

+

+static bool gUseCircuitCallbackCalled = false;

+

+EStartupState LLStartUp::gStartupState = STATE_FIRST;

+LLSLURL LLStartUp::sStartSLURL;

+

+static LLPointer<LLCredential> gUserCredential;

+static std::string gDisplayName;

+static BOOL gRememberPassword = TRUE;     

+

+static U64 gFirstSimHandle = 0;

+static LLHost gFirstSim;

+static std::string gFirstSimSeedCap;

+static LLVector3 gAgentStartLookAt(1.0f, 0.f, 0.f);

+static std::string gAgentStartLocation = "safe";

+static bool mLoginStatePastUI = false;

+

+

+boost::scoped_ptr<LLEventPump> LLStartUp::sStateWatcher(new LLEventStream("StartupState"));

+boost::scoped_ptr<LLStartupListener> LLStartUp::sListener(new LLStartupListener());

+

+//

+// local function declaration

+//

+

+void login_show();

+void login_callback(S32 option, void* userdata);

+void show_first_run_dialog();

+bool first_run_dialog_callback(const LLSD& notification, const LLSD& response);

+void set_startup_status(const F32 frac, const std::string& string, const std::string& msg);

+bool login_alert_status(const LLSD& notification, const LLSD& response);

+void login_packet_failed(void**, S32 result);

+void use_circuit_callback(void**, S32 result);

+void register_viewer_callbacks(LLMessageSystem* msg);

+void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32);

+bool callback_choose_gender(const LLSD& notification, const LLSD& response);

+void init_start_screen(S32 location_id);

+void release_start_screen();

+void reset_login();

+LLSD transform_cert_args(LLPointer<LLCertificate> cert);

+void general_cert_done(const LLSD& notification, const LLSD& response);

+void trust_cert_done(const LLSD& notification, const LLSD& response);

+void apply_udp_blacklist(const std::string& csv);

+bool process_login_success_response();

+void transition_back_to_login_panel(const std::string& emsg);

+

+void callback_cache_name(const LLUUID& id, const std::string& full_name, bool is_group)

+{

+	LLNameBox::refreshAll(id, full_name, is_group);

+	LLNameEditor::refreshAll(id, full_name, is_group);

+	

+	// TODO: Actually be intelligent about the refresh.

+	// For now, just brute force refresh the dialogs.

+	dialog_refresh_all();

+}

+

+//

+// exported functionality

+//

+

+//

+// local classes

+//

+

+namespace

+{

+	class LLNullHTTPSender : public LLHTTPSender

+	{

+		virtual void send(const LLHost& host, 

+						  const std::string& message, const LLSD& body, 

+						  LLHTTPClient::ResponderPtr response) const

+		{

+			LL_WARNS("AppInit") << " attemped to send " << message << " to " << host

+					<< " with null sender" << LL_ENDL;

+		}

+	};

+}

+

+void update_texture_fetch()

+{

+	LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread

+	LLAppViewer::getImageDecodeThread()->update(1); // unpauses the image thread

+	LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread

+	gTextureList.updateImages(0.10f);

+}

+

+// Returns false to skip other idle processing. Should only return

+// true when all initialization done.

+bool idle_startup()

+{

+	LLMemType mt1(LLMemType::MTYPE_STARTUP);

+	

+	const F32 PRECACHING_DELAY = gSavedSettings.getF32("PrecachingDelay");

+	static LLTimer timeout;

+	static S32 timeout_count = 0;

+

+	static LLTimer login_time;

+

+	// until this is encapsulated, this little hack for the

+	// auth/transform loop will do.

+	static F32 progress = 0.10f;

+

+	static std::string auth_desc;

+	static std::string auth_message;

+

+	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);

+	static LLVector3 agent_start_position_region(10.f, 10.f, 10.f);		// default for when no space server

+

+	// last location by default

+	static S32  agent_location_id = START_LOCATION_ID_LAST;

+	static S32  location_which = START_LOCATION_ID_LAST;

+

+	static bool show_connect_box = true;

+

+	//static bool stipend_since_login = false;

+

+	// HACK: These are things from the main loop that usually aren't done

+	// until initialization is complete, but need to be done here for things

+	// to work.

+	gIdleCallbacks.callFunctions();

+	gViewerWindow->updateUI();

+	LLMortician::updateClass();

+

+	const std::string delims (" ");

+	std::string system;

+	int begIdx, endIdx;

+	std::string osString = LLAppViewer::instance()->getOSInfo().getOSStringSimple();

+

+	begIdx = osString.find_first_not_of (delims);

+	endIdx = osString.find_first_of (delims, begIdx);

+	system = osString.substr (begIdx, endIdx - begIdx);

+	system += "Locale";

+

+	LLStringUtil::setLocale (LLTrans::getString(system));

+

+	if (!gNoRender)

+	{

+		//note: Removing this line will cause incorrect button size in the login screen. -- bao.

+		gTextureList.updateImages(0.01f) ;

+	}

+

+	if ( STATE_FIRST == LLStartUp::getStartupState() )

+	{

+		gViewerWindow->showCursor(); 

+		gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);

+

+		/////////////////////////////////////////////////

+		//

+		// Initialize stuff that doesn't need data from simulators

+		//

+

+		if (LLFeatureManager::getInstance()->isSafe())

+		{

+			LLNotificationsUtil::add("DisplaySetToSafe");

+		}

+		else if ((gSavedSettings.getS32("LastFeatureVersion") < LLFeatureManager::getInstance()->getVersion()) &&

+				 (gSavedSettings.getS32("LastFeatureVersion") != 0))

+		{

+			LLNotificationsUtil::add("DisplaySetToRecommended");

+		}

+		else if ((gSavedSettings.getS32("LastGPUClass") != LLFeatureManager::getInstance()->getGPUClass()) &&

+				 (gSavedSettings.getS32("LastGPUClass") != -1))

+		{

+			LLNotificationsUtil::add("DisplaySetToRecommended");

+		}

+		else if (!gViewerWindow->getInitAlert().empty())

+		{

+			LLNotificationsUtil::add(gViewerWindow->getInitAlert());

+		}

+			

+		gSavedSettings.setS32("LastFeatureVersion", LLFeatureManager::getInstance()->getVersion());

+		gSavedSettings.setS32("LastGPUClass", LLFeatureManager::getInstance()->getGPUClass());

+

+		// load dynamic GPU/feature tables from website (S3)

+		LLFeatureManager::getInstance()->fetchHTTPTables();

+		

+		std::string xml_file = LLUI::locateSkin("xui_version.xml");

+		LLXMLNodePtr root;

+		bool xml_ok = false;

+		if (LLXMLNode::parseFile(xml_file, root, NULL))

+		{

+			if( (root->hasName("xui_version") ) )

+			{

+				std::string value = root->getValue();

+				F32 version = 0.0f;

+				LLStringUtil::convertToF32(value, version);

+				if (version >= 1.0f)

+				{

+					xml_ok = true;

+				}

+			}

+		}

+		if (!xml_ok)

+		{

+			// If XML is bad, there's a good possibility that notifications.xml is ALSO bad.

+			// If that's so, then we'll get a fatal error on attempting to load it, 

+			// which will display a nontranslatable error message that says so.

+			// Otherwise, we'll display a reasonable error message that IS translatable.

+			LLAppViewer::instance()->earlyExit("BadInstallation");

+		}

+		//

+		// Statistics stuff

+		//

+

+		// Load autopilot and stats stuff

+		gAgentPilot.load(gSavedSettings.getString("StatsPilotFile"));

+

+		//gErrorStream.setTime(gSavedSettings.getBOOL("LogTimestamps"));

+

+		// Load the throttle settings

+		gViewerThrottle.load();

+

+		if (ll_init_ares() == NULL || !gAres->isInitialized())

+		{

+			std::string diagnostic = "Could not start address resolution system";

+			LL_WARNS("AppInit") << diagnostic << LL_ENDL;

+			LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().with("DIAGNOSTIC", diagnostic));

+		}

+		

+		//

+		// Initialize messaging system

+		//

+		LL_DEBUGS("AppInit") << "Initializing messaging system..." << LL_ENDL;

+

+		std::string message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message_template.msg");

+

+		LLFILE* found_template = NULL;

+		found_template = LLFile::fopen(message_template_path, "r");		/* Flawfinder: ignore */

+		

+		#if LL_WINDOWS

+			// On the windows dev builds, unpackaged, the message_template.msg 

+			// file will be located in:

+			// build-vc**/newview/<config>/app_settings

+			if (!found_template)

+			{

+				message_template_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", "message_template.msg");

+				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */

+			}	

+		#elif LL_DARWIN

+			// On Mac dev builds, message_template.msg lives in:

+			// indra/build-*/newview/<config>/Second Life/Contents/Resources/app_settings

+			if (!found_template)

+			{

+				message_template_path =

+					gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE,

+												   "../Resources/app_settings",

+												   "message_template.msg");

+				found_template = LLFile::fopen(message_template_path.c_str(), "r");		/* Flawfinder: ignore */

+			}		

+		#endif

+

+		if (found_template)

+		{

+			fclose(found_template);

+

+			U32 port = gSavedSettings.getU32("UserConnectionPort");

+

+			if ((NET_USE_OS_ASSIGNED_PORT == port) &&   // if nothing specified on command line (-port)

+			    (gSavedSettings.getBOOL("ConnectionPortEnabled")))

+			  {

+			    port = gSavedSettings.getU32("ConnectionPort");

+			  }

+

+			LLHTTPSender::setDefaultSender(new LLNullHTTPSender());

+

+			// TODO parameterize 

+			const F32 circuit_heartbeat_interval = 5;

+			const F32 circuit_timeout = 100;

+

+			const LLUseCircuitCodeResponder* responder = NULL;

+			bool failure_is_fatal = true;

+			

+			if(!start_messaging_system(

+				   message_template_path,

+				   port,

+				   LLVersionInfo::getMajor(),

+				   LLVersionInfo::getMinor(),

+				   LLVersionInfo::getPatch(),

+				   FALSE,

+				   std::string(),

+				   responder,

+				   failure_is_fatal,

+				   circuit_heartbeat_interval,

+				   circuit_timeout))

+			{

+				std::string diagnostic = llformat(" Error: %d", gMessageSystem->getErrorCode());

+				LL_WARNS("AppInit") << diagnostic << LL_ENDL;

+				LLAppViewer::instance()->earlyExit("LoginFailedNoNetwork", LLSD().with("DIAGNOSTIC", diagnostic));

+			}

+

+			#if LL_WINDOWS

+				// On the windows dev builds, unpackaged, the message.xml file will 

+				// be located in indra/build-vc**/newview/<config>/app_settings.

+				std::string message_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"message.xml");

+							

+				if (!LLFile::isfile(message_path.c_str())) 

+				{

+					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "app_settings", ""));

+				}

+				else

+				{

+					LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));

+				}

+			#else			

+				LLMessageConfig::initClass("viewer", gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));

+			#endif

+

+		}

+		else

+		{

+			LLAppViewer::instance()->earlyExit("MessageTemplateNotFound", LLSD().with("PATH", message_template_path));

+		}

+

+		if(gMessageSystem && gMessageSystem->isOK())

+		{

+			// Initialize all of the callbacks in case of bad message

+			// system data

+			LLMessageSystem* msg = gMessageSystem;

+			msg->setExceptionFunc(MX_UNREGISTERED_MESSAGE,

+								  invalid_message_callback,

+								  NULL);

+			msg->setExceptionFunc(MX_PACKET_TOO_SHORT,

+								  invalid_message_callback,

+								  NULL);

+

+			// running off end of a packet is now valid in the case

+			// when a reader has a newer message template than

+			// the sender

+			/*msg->setExceptionFunc(MX_RAN_OFF_END_OF_PACKET,

+								  invalid_message_callback,

+								  NULL);*/

+			msg->setExceptionFunc(MX_WROTE_PAST_BUFFER_SIZE,

+								  invalid_message_callback,

+								  NULL);

+

+			if (gSavedSettings.getBOOL("LogMessages"))

+			{

+				LL_DEBUGS("AppInit") << "Message logging activated!" << LL_ENDL;

+				msg->startLogging();

+			}

+

+			// start the xfer system. by default, choke the downloads

+			// a lot...

+			const S32 VIEWER_MAX_XFER = 3;

+			start_xfer_manager(gVFS);

+			gXferManager->setMaxIncomingXfers(VIEWER_MAX_XFER);

+			F32 xfer_throttle_bps = gSavedSettings.getF32("XferThrottle");

+			if (xfer_throttle_bps > 1.f)

+			{

+				gXferManager->setUseAckThrottling(TRUE);

+				gXferManager->setAckThrottleBPS(xfer_throttle_bps);

+			}

+			gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS, gStaticVFS);

+

+

+			F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");

+			msg->mPacketRing.setDropPercentage(dropPercent);

+

+            F32 inBandwidth = gSavedSettings.getF32("InBandwidth"); 

+            F32 outBandwidth = gSavedSettings.getF32("OutBandwidth"); 

+			if (inBandwidth != 0.f)

+			{

+				LL_DEBUGS("AppInit") << "Setting packetring incoming bandwidth to " << inBandwidth << LL_ENDL;

+				msg->mPacketRing.setUseInThrottle(TRUE);

+				msg->mPacketRing.setInBandwidth(inBandwidth);

+			}

+			if (outBandwidth != 0.f)

+			{

+				LL_DEBUGS("AppInit") << "Setting packetring outgoing bandwidth to " << outBandwidth << LL_ENDL;

+				msg->mPacketRing.setUseOutThrottle(TRUE);

+				msg->mPacketRing.setOutBandwidth(outBandwidth);

+			}

+		}

+

+		LL_INFOS("AppInit") << "Message System Initialized." << LL_ENDL;

+		

+		//-------------------------------------------------

+		// Init audio, which may be needed for prefs dialog

+		// or audio cues in connection UI.

+		//-------------------------------------------------

+

+		if (FALSE == gSavedSettings.getBOOL("NoAudio"))

+		{

+			gAudiop = NULL;

+

+#ifdef LL_OPENAL

+			if (!gAudiop

+#if !LL_WINDOWS

+			    && NULL == getenv("LL_BAD_OPENAL_DRIVER")

+#endif // !LL_WINDOWS

+			    )

+			{

+				gAudiop = (LLAudioEngine *) new LLAudioEngine_OpenAL();

+			}

+#endif

+

+#ifdef LL_FMOD			

+			if (!gAudiop

+#if !LL_WINDOWS

+			    && NULL == getenv("LL_BAD_FMOD_DRIVER")

+#endif // !LL_WINDOWS

+			    )

+			{

+				gAudiop = (LLAudioEngine *) new LLAudioEngine_FMOD();

+			}

+#endif

+

+			if (gAudiop)

+			{

+#if LL_WINDOWS

+				// FMOD on Windows needs the window handle to stop playing audio

+				// when window is minimized. JC

+				void* window_handle = (HWND)gViewerWindow->getPlatformWindow();

+#else

+				void* window_handle = NULL;

+#endif

+				bool init = gAudiop->init(kAUDIO_NUM_SOURCES, window_handle);

+				if(init)

+				{

+					gAudiop->setMuted(TRUE);

+				}

+				else

+				{

+					LL_WARNS("AppInit") << "Unable to initialize audio engine" << LL_ENDL;

+					delete gAudiop;

+					gAudiop = NULL;

+				}

+

+				if (gAudiop)

+				{

+					// if the audio engine hasn't set up its own preferred handler for streaming audio then set up the generic streaming audio implementation which uses media plugins

+					if (NULL == gAudiop->getStreamingAudioImpl())

+					{

+						LL_INFOS("AppInit") << "Using media plugins to render streaming audio" << LL_ENDL;

+						gAudiop->setStreamingAudioImpl(new LLStreamingAudio_MediaPlugins());

+					}

+				}

+			}

+		}

+		

+		LL_INFOS("AppInit") << "Audio Engine Initialized." << LL_ENDL;

+		

+		if (LLTimer::knownBadTimer())

+		{

+			LL_WARNS("AppInit") << "Unreliable timers detected (may be bad PCI chipset)!!" << LL_ENDL;

+		}

+

+		//

+		// Log on to system

+		//

+		if (gUserCredential.isNull())

+		{

+			gUserCredential = gLoginHandler.initializeLoginInfo();

+		}

+		if (gUserCredential.isNull())

+		{

+			show_connect_box = TRUE;

+		}

+		else if (gSavedSettings.getBOOL("AutoLogin"))  

+		{

+			gRememberPassword = TRUE;

+			gSavedSettings.setBOOL("RememberPassword", TRUE);                                                      

+			show_connect_box = false;    			

+		}

+		else 

+		{

+			gRememberPassword = gSavedSettings.getBOOL("RememberPassword");

+			show_connect_box = TRUE;

+		}

+		// Go to the next startup state

+		LLStartUp::setStartupState( STATE_BROWSER_INIT );

+		return FALSE;

+	}

+

+	

+	if (STATE_BROWSER_INIT == LLStartUp::getStartupState())

+	{

+		LL_DEBUGS("AppInit") << "STATE_BROWSER_INIT" << LL_ENDL;

+		std::string msg = LLTrans::getString("LoginInitializingBrowser");

+		set_startup_status(0.03f, msg.c_str(), gAgent.mMOTD.c_str());

+		display_startup();

+		// LLViewerMedia::initBrowser();

+		LLStartUp::setStartupState( STATE_LOGIN_SHOW );

+		return FALSE;

+	}

+

+

+	if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())

+	{

+		LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;

+

+		// if we've gone backwards in the login state machine, to this state where we show the UI

+		// AND the debug setting to exit in this case is true, then go ahead and bail quickly

+		if ( mLoginStatePastUI && gSavedSettings.getBOOL("QuitOnLoginActivated") )

+		{

+			// no requirement for notification here - just exit

+			LLAppViewer::instance()->earlyExitNoNotify();

+		}

+

+		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);

+

+		timeout_count = 0;

+

+		if (show_connect_box)

+		{

+			// Load all the name information out of the login view

+			// NOTE: Hits "Attempted getFields with no login view shown" warning, since we don't

+			// show the login view until login_show() is called below.  

+			if (gUserCredential.isNull())                                                                          

+			{                                                                                                      

+				gUserCredential = gLoginHandler.initializeLoginInfo();                 

+			}     

+			if (gNoRender)

+			{

+				LL_ERRS("AppInit") << "Need to autologin or use command line with norender!" << LL_ENDL;

+			}

+			// Make sure the process dialog doesn't hide things

+			gViewerWindow->setShowProgress(FALSE);

+

+			initialize_edit_menu();

+

+			// Show the login dialog

+			login_show();

+			// connect dialog is already shown, so fill in the names

+			if (gUserCredential.notNull())                                                                         

+			{                                                                                                      

+				LLPanelLogin::setFields( gUserCredential, gRememberPassword);                                  

+			}     

+			LLPanelLogin::giveFocus();

+

+			gSavedSettings.setBOOL("FirstRunThisInstall", FALSE);

+

+			LLStartUp::setStartupState( STATE_LOGIN_WAIT );		// Wait for user input

+		}

+		else

+		{

+			// skip directly to message template verification

+			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );

+		}

+

+		// *NOTE: This is where LLViewerParcelMgr::getInstance() used to get allocated before becoming LLViewerParcelMgr::getInstance().

+

+		// *NOTE: This is where gHUDManager used to bet allocated before becoming LLHUDManager::getInstance().

+

+		// *NOTE: This is where gMuteList used to get allocated before becoming LLMuteList::getInstance().

+

+		// Login screen needs menus for preferences, but we can enter

+		// this startup phase more than once.

+		if (gLoginMenuBarView == NULL)

+		{

+			init_menus();

+		}

+		

+		gViewerWindow->setNormalControlsVisible( FALSE );	

+		gLoginMenuBarView->setVisible( TRUE );

+		gLoginMenuBarView->setEnabled( TRUE );

+		show_debug_menus();

+

+		// Hide the splash screen

+		LLSplashScreen::hide();

+

+		// Push our window frontmost

+		gViewerWindow->getWindow()->show();

+		display_startup();

+

+		// DEV-16927.  The following code removes errant keystrokes that happen while the window is being 

+		// first made visible.

+#ifdef _WIN32

+		MSG msg;

+		while( PeekMessage( &msg, /*All hWnds owned by this thread */ NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE ) );

+#endif

+		timeout.reset();

+		return FALSE;

+	}

+

+	if (STATE_LOGIN_WAIT == LLStartUp::getStartupState())

+	{

+		// when we get to this state, we've already been past the login UI

+		// (possiblely automatically) - flag this so we can test in the 

+		// STATE_LOGIN_SHOW state if we've gone backwards

+		mLoginStatePastUI = true;

+

+		// Don't do anything.  Wait for the login view to call the login_callback,

+		// which will push us to the next state.

+

+		// Sleep so we don't spin the CPU

+		ms_sleep(1);

+		return FALSE;

+	}

+

+	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())

+	{

+		//reset the values that could have come in from a slurl

+		// DEV-42215: Make sure they're not empty -- gUserCredential

+		// might already have been set from gSavedSettings, and it's too bad

+		// to overwrite valid values with empty strings.

+

+		if (show_connect_box)

+		{

+			// TODO if not use viewer auth

+			// Load all the name information out of the login view

+			LLPanelLogin::getFields(gUserCredential, gRememberPassword); 

+			// end TODO

+	 

+			// HACK: Try to make not jump on login

+			gKeyboard->resetKeys();

+		}

+

+		// when we get to this state, we've already been past the login UI

+		// (possiblely automatically) - flag this so we can test in the 

+		// STATE_LOGIN_SHOW state if we've gone backwards

+		mLoginStatePastUI = true;

+

+		// save the credentials                                                                                        

+		std::string userid = "unknown";                                                                                

+		if(gUserCredential.notNull())                                                                                  

+		{  

+			userid = gUserCredential->userID();                                                                    

+			gSecAPIHandler->saveCredential(gUserCredential, gRememberPassword);  

+		}

+		gSavedSettings.setBOOL("RememberPassword", gRememberPassword);                                                 

+		LL_INFOS("AppInit") << "Attempting login as: " << userid << LL_ENDL;                                           

+		gDebugInfo["LoginName"] = userid;                                                                              

+         

+		// create necessary directories

+		// *FIX: these mkdir's should error check

+		gDirUtilp->setLindenUserDir(userid);

+		LLFile::mkdir(gDirUtilp->getLindenUserDir());

+

+		// Set PerAccountSettingsFile to the default value.

+		std::string per_account_settings_file = LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount");

+		gSavedSettings.setString("PerAccountSettingsFile",

+			gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, 

+				LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")));

+

+		// Note: can't store warnings files per account because some come up before login

+		

+		// Overwrite default user settings with user settings								 

+		LLAppViewer::instance()->loadSettingsFromDirectory("Account");

+

+		// Need to set the LastLogoff time here if we don't have one.  LastLogoff is used for "Recent Items" calculation

+		// and startup time is close enough if we don't have a real value.

+		if (gSavedPerAccountSettings.getU32("LastLogoff") == 0)

+		{

+			gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());

+		}

+

+		//Default the path if one isn't set.

+		// *NOTE: unable to check variable differ from "InstantMessageLogPath" because it was

+		// provided in pre 2.0 viewer. See EXT-6661

+		if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty())

+		{

+			gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir());

+			gSavedPerAccountSettings.setString("InstantMessageLogPath", gDirUtilp->getChatLogsDir());

+		}

+		else

+		{

+			gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));		

+		}

+		gDirUtilp->setPerAccountChatLogsDir(userid);  

+		

+		LLFile::mkdir(gDirUtilp->getChatLogsDir());

+		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());

+

+

+		//good a place as any to create user windlight directories

+		std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", ""));

+		LLFile::mkdir(user_windlight_path_name.c_str());		

+

+		std::string user_windlight_skies_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));

+		LLFile::mkdir(user_windlight_skies_path_name.c_str());

+

+		std::string user_windlight_water_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));

+		LLFile::mkdir(user_windlight_water_path_name.c_str());

+

+		std::string user_windlight_days_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/days", ""));

+		LLFile::mkdir(user_windlight_days_path_name.c_str());

+

+

+		if (show_connect_box)

+		{

+			LLSLURL slurl;

+			LLPanelLogin::closePanel();

+		}

+

+		

+		// Load URL History File

+		LLURLHistory::loadFile("url_history.xml");

+		// Load location history 

+		LLLocationHistory::getInstance()->load();

+

+		// Load Avatars icons cache

+		LLAvatarIconIDCache::getInstance()->load();

+		

+		// Load media plugin cookies

+		LLViewerMedia::loadCookieFile();

+

+		//-------------------------------------------------

+		// Handle startup progress screen

+		//-------------------------------------------------

+

+		// on startup the user can request to go to their home,

+		// their last location, or some URL "-url //sim/x/y[/z]"

+		// All accounts have both a home and a last location, and we don't support

+		// more locations than that.  Choose the appropriate one.  JC

+		switch (LLStartUp::getStartSLURL().getType())

+		  {

+		  case LLSLURL::LOCATION:

+		    agent_location_id = START_LOCATION_ID_URL;

+		    location_which = START_LOCATION_ID_LAST;

+		    break;

+		  case LLSLURL::LAST_LOCATION:

+		    agent_location_id = START_LOCATION_ID_LAST;

+		    location_which = START_LOCATION_ID_LAST;

+		    break;

+		  default:

+		    agent_location_id = START_LOCATION_ID_HOME;

+		    location_which = START_LOCATION_ID_HOME;

+		    break;

+		  }

+

+		gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);

+

+		if (!gNoRender)

+		{

+			init_start_screen(agent_location_id);

+		}

+

+		// Display the startup progress bar.

+		gViewerWindow->setShowProgress(TRUE);

+		gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));

+

+		// Poke the VFS, which could potentially block for a while if

+		// Windows XP is acting up

+		set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null);

+		display_startup();

+

+		gVFS->pokeFiles();

+

+		LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );

+

+		return FALSE;

+	}

+

+	if(STATE_LOGIN_AUTH_INIT == LLStartUp::getStartupState())

+	{

+		gDebugInfo["GridName"] = LLGridManager::getInstance()->getGridLabel();

+

+		// Update progress status and the display loop.

+		auth_desc = LLTrans::getString("LoginInProgress");

+		set_startup_status(progress, auth_desc, auth_message);

+		progress += 0.02f;

+		display_startup();

+

+		// Setting initial values...

+		LLLoginInstance* login = LLLoginInstance::getInstance();

+		login->setNotificationsInterface(LLNotifications::getInstance());

+		if(gNoRender)

+		{

+			// HACK, skip optional updates if you're running drones

+			login->setSkipOptionalUpdate(true);

+		}

+

+		login->setSerialNumber(LLAppViewer::instance()->getSerialNumber());

+		login->setLastExecEvent(gLastExecEvent);

+		login->setUpdaterLauncher(boost::bind(&LLAppViewer::launchUpdater, LLAppViewer::instance()));

+

+		// This call to LLLoginInstance::connect() starts the 

+		// authentication process.

+		login->connect(gUserCredential);

+

+		LLStartUp::setStartupState( STATE_LOGIN_CURL_UNSTUCK );

+		return FALSE;

+	}

+

+	if(STATE_LOGIN_CURL_UNSTUCK == LLStartUp::getStartupState())

+	{

+		// If we get here we have gotten past the potential stall

+		// in curl, so take "may appear frozen" out of progress bar. JC

+		auth_desc = LLTrans::getString("LoginInProgressNoFrozen");

+		set_startup_status(progress, auth_desc, auth_message);

+

+		LLStartUp::setStartupState( STATE_LOGIN_PROCESS_RESPONSE );

+		return FALSE;

+	}

+

+	if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState()) 

+	{

+		std::ostringstream emsg;

+		emsg << LLTrans::getString("LoginFailed") << "\n";

+		if(LLLoginInstance::getInstance()->authFailure())

+		{

+			LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): "

+			                      << LLLoginInstance::getInstance()->getResponse() << LL_ENDL;

+			LLSD response = LLLoginInstance::getInstance()->getResponse();

+			// Still have error conditions that may need some 

+			// sort of handling.

+			std::string reason_response = response["reason"];

+			std::string message_response = response["message"];

+	

+			if(!message_response.empty())

+			{

+				// XUI: fix translation for strings returned during login

+				// We need a generic table for translations

+				std::string big_reason = LLAgent::sTeleportErrorMessages[ message_response ];

+				if ( big_reason.size() == 0 )

+				{

+					emsg << message_response;

+				}

+				else

+				{

+					emsg << big_reason;

+				}

+			}

+

+			if(reason_response == "key")

+			{

+				// Couldn't login because user/password is wrong

+				// Clear the credential

+				gUserCredential->clearAuthenticator();

+			}

+

+			if(reason_response == "update" 

+				|| reason_response == "optional")

+			{

+				// In the case of a needed update, quit.

+				// Its either downloading or declined.

+				// If optional was skipped this case shouldn't 

+				// be reached.

+				LLLoginInstance::getInstance()->disconnect();

+				LLAppViewer::instance()->forceQuit();

+			}

+			else 

+			{

+				if (reason_response != "tos") 

+				{

+					// Don't pop up a notification in the TOS case because

+					// LLFloaterTOS::onCancel() already scolded the user.

+					std::string error_code;

+					if(response.has("errorcode"))

+					{

+						error_code = response["errorcode"].asString();

+					}

+					if ((reason_response == "CURLError") && 

+						(error_code == "SSL_CACERT" || error_code == "SSL_PEER_CERTIFICATE") && 

+						response.has("certificate"))

+					{

+						// This was a certificate error, so grab the certificate

+						// and throw up the appropriate dialog.

+						LLPointer<LLCertificate> certificate = gSecAPIHandler->getCertificate(response["certificate"]);

+						if(certificate)

+						{

+							LLSD args = transform_cert_args(certificate);

+

+							if(error_code == "SSL_CACERT")

+							{

+								// if we are handling an untrusted CA, throw up the dialog                             

+								// with the 'trust this CA' button.                                                    

+								LLNotificationsUtil::add("TrustCertificateError", args, response,

+														trust_cert_done);

+								

+								show_connect_box = true;

+							}

+							else

+							{

+								// the certificate exception returns a unique string for each type of exception.       

+								// we grab this string via the LLUserAuth object, and use that to grab the localized   

+								// string.                                                                             

+								args["REASON"] = LLTrans::getString(message_response);

+								

+								LLNotificationsUtil::add("GeneralCertificateError", args, response,

+														 general_cert_done);

+								

+								reset_login();

+								gSavedSettings.setBOOL("AutoLogin", FALSE);

+								show_connect_box = true;

+								

+							}

+

+						}

+					}

+					else 

+					{

+						// This wasn't a certificate error, so throw up the normal

+						// notificatioin message.

+						LLSD args;

+						args["ERROR_MESSAGE"] = emsg.str();

+						LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;

+						LLNotificationsUtil::add("ErrorMessage", args, LLSD(), login_alert_done);

+					}

+				}

+				//setup map of datetime strings to codes and slt & local time offset from utc

+				// *TODO: Does this need to be here?

+				LLStringOps::setupDatetimeInfo (false);

+				transition_back_to_login_panel(emsg.str());

+				show_connect_box = true;

+			}

+		}

+		else if(LLLoginInstance::getInstance()->authSuccess())

+		{

+			if(process_login_success_response())

+			{

+				// Pass the user information to the voice chat server interface.

+				LLVoiceClient::getInstance()->userAuthorized(gUserCredential->userID(), gAgentID);

+				// create the default proximal channel

+				LLVoiceChannel::initClass();

+				LLGridManager::getInstance()->setFavorite(); 

+				LLStartUp::setStartupState( STATE_WORLD_INIT);

+			}

+			else

+			{

+				LLSD args;

+				args["ERROR_MESSAGE"] = emsg.str();

+				LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;

+				LLNotificationsUtil::add("ErrorMessage", args, LLSD(), login_alert_done);

+				transition_back_to_login_panel(emsg.str());

+				show_connect_box = true;

+				return FALSE;

+			}

+		}

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// World Init

+	//---------------------------------------------------------------------

+	if (STATE_WORLD_INIT == LLStartUp::getStartupState())

+	{

+		set_startup_status(0.30f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);

+		display_startup();

+		// We should have an agent id by this point.

+		llassert(!(gAgentID == LLUUID::null));

+

+		// Finish agent initialization.  (Requires gSavedSettings, builds camera)

+		gAgent.init();

+		gAgentCamera.init();

+		set_underclothes_menu_options();

+

+		// Since we connected, save off the settings so the user doesn't have to

+		// type the name/password again if we crash.

+		gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);

+		LLUIColorTable::instance().saveUserSettings();

+

+		//

+		// Initialize classes w/graphics stuff.

+		//

+		gTextureList.doPrefetchImages();		

+		LLSurface::initClasses();

+

+		LLFace::initClass();

+

+		LLDrawable::initClass();

+

+		// init the shader managers

+		LLPostProcess::initClass();

+		LLWLParamManager::initClass();

+		LLWaterParamManager::initClass();

+

+		LLViewerObject::initVOClasses();

+

+		// Initialize all our tools.  Must be done after saved settings loaded.

+		// NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.

+		LLToolMgr::getInstance()->initTools();

+

+		// Pre-load floaters, like the world map, that are slow to spawn

+		// due to XML complexity.

+		gViewerWindow->initWorldUI();

+

+		display_startup();

+

+		// This is where we used to initialize gWorldp. Original comment said:

+		// World initialization must be done after above window init

+

+		// User might have overridden far clip

+		LLWorld::getInstance()->setLandFarClip(gAgentCamera.mDrawDistance);

+

+		// Before we create the first region, we need to set the agent's mOriginGlobal

+		// This is necessary because creating objects before this is set will result in a

+		// bad mPositionAgent cache.

+

+		gAgent.initOriginGlobal(from_region_handle(gFirstSimHandle));

+

+		LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim);

+

+		LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(gFirstSimHandle);

+		LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;

+		

+		regionp->setSeedCapability(gFirstSimSeedCap);

+		LL_DEBUGS("AppInit") << "Waiting for seed grant ...." << LL_ENDL;

+		

+		// Set agent's initial region to be the one we just created.

+		gAgent.setRegion(regionp);

+

+		// Set agent's initial position, which will be read by LLVOAvatar when the avatar

+		// object is created.  I think this must be done after setting the region.  JC

+		gAgent.setPositionAgent(agent_start_position_region);

+

+		display_startup();

+		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );

+		

+		return FALSE;

+	}

+

+

+	//---------------------------------------------------------------------

+	// Load QuickTime/GStreamer and other multimedia engines, can be slow.

+	// Do it while we're waiting on the network for our seed capability. JC

+	//---------------------------------------------------------------------

+	if (STATE_MULTIMEDIA_INIT == LLStartUp::getStartupState())

+	{

+		LLStartUp::multimediaInit();

+		LLStartUp::setStartupState( STATE_FONT_INIT );

+		return FALSE;

+	}

+

+	// Loading fonts takes several seconds

+	if (STATE_FONT_INIT == LLStartUp::getStartupState())

+	{

+		LLStartUp::fontInit();

+		LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// Wait for Seed Cap Grant

+	//---------------------------------------------------------------------

+	if(STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())

+	{

+		return FALSE;

+	}

+

+

+	//---------------------------------------------------------------------

+	// Seed Capability Granted

+	// no newMessage calls should happen before this point

+	//---------------------------------------------------------------------

+	if (STATE_SEED_CAP_GRANTED == LLStartUp::getStartupState())

+	{

+		update_texture_fetch();

+

+		if ( gViewerWindow != NULL)

+		{	// This isn't the first logon attempt, so show the UI

+			gViewerWindow->setNormalControlsVisible( TRUE );

+		}	

+		gLoginMenuBarView->setVisible( FALSE );

+		gLoginMenuBarView->setEnabled( FALSE );

+

+		if (!gNoRender)

+		{

+			// direct logging to the debug console's line buffer

+			LLError::logToFixedBuffer(gDebugView->mDebugConsolep);

+			

+			// set initial visibility of debug console

+			gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));

+		}

+

+		//

+		// Set message handlers

+		//

+		LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL;

+

+		// register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted

+		register_viewer_callbacks(gMessageSystem);

+

+		// Debugging info parameters

+		gMessageSystem->setMaxMessageTime( 0.5f );			// Spam if decoding all msgs takes more than 500 ms

+

+		#ifndef	LL_RELEASE_FOR_DOWNLOAD

+			gMessageSystem->setTimeDecodes( TRUE );				// Time the decode of each msg

+			gMessageSystem->setTimeDecodesSpamThreshold( 0.05f );  // Spam if a single msg takes over 50ms to decode

+		#endif

+

+		gXferManager->registerCallbacks(gMessageSystem);

+

+		LLStartUp::initNameCache();

+

+		// update the voice settings *after* gCacheName initialization

+		// so that we can construct voice UI that relies on the name cache

+		LLVoiceClient::getInstance()->updateSettings();

+

+		//gCacheName is required for nearby chat history loading

+		//so I just moved nearby history loading a few states further

+		if (!gNoRender && gSavedPerAccountSettings.getBOOL("LogShowHistory"))

+		{

+			LLNearbyChat* nearby_chat = LLNearbyChat::getInstance();

+			if (nearby_chat) nearby_chat->loadHistory();

+		}

+

+		// *Note: this is where gWorldMap used to be initialized.

+

+		// register null callbacks for audio until the audio system is initialized

+		gMessageSystem->setHandlerFuncFast(_PREHASH_SoundTrigger, null_message_callback, NULL);

+		gMessageSystem->setHandlerFuncFast(_PREHASH_AttachedSound, null_message_callback, NULL);

+

+		//reset statistics

+		LLViewerStats::getInstance()->resetStats();

+

+		display_startup();

+		//

+		// Set up region and surface defaults

+		//

+

+

+		// Sets up the parameters for the first simulator

+

+		LL_DEBUGS("AppInit") << "Initializing camera..." << LL_ENDL;

+		gFrameTime    = totalTime();

+		F32 last_time = gFrameTimeSeconds;

+		gFrameTimeSeconds = (S64)(gFrameTime - gStartTime)/SEC_TO_MICROSEC;

+

+		gFrameIntervalSeconds = gFrameTimeSeconds - last_time;

+		if (gFrameIntervalSeconds < 0.f)

+		{

+			gFrameIntervalSeconds = 0.f;

+		}

+

+		// Make sure agent knows correct aspect ratio

+		// FOV limits depend upon aspect ratio so this needs to happen before initializing the FOV below

+		LLViewerCamera::getInstance()->setViewHeightInPixels(gViewerWindow->getWorldViewHeightRaw());

+		LLViewerCamera::getInstance()->setAspect(gViewerWindow->getWorldViewAspectRatio());

+		// Initialize FOV

+		LLViewerCamera::getInstance()->setDefaultFOV(gSavedSettings.getF32("CameraAngle")); 

+

+		// Move agent to starting location. The position handed to us by

+		// the space server is in global coordinates, but the agent frame

+		// is in region local coordinates. Therefore, we need to adjust

+		// the coordinates handed to us to fit in the local region.

+

+		gAgent.setPositionAgent(agent_start_position_region);

+		gAgent.resetAxes(gAgentStartLookAt);

+		gAgentCamera.stopCameraAnimation();

+		gAgentCamera.resetCamera();

+

+		// Initialize global class data needed for surfaces (i.e. textures)

+		if (!gNoRender)

+		{

+			LL_DEBUGS("AppInit") << "Initializing sky..." << LL_ENDL;

+			// Initialize all of the viewer object classes for the first time (doing things like texture fetches.

+			LLGLState::checkStates();

+			LLGLState::checkTextureChannels();

+

+			gSky.init(initial_sun_direction);

+

+			LLGLState::checkStates();

+			LLGLState::checkTextureChannels();

+		}

+

+		LL_DEBUGS("AppInit") << "Decoding images..." << LL_ENDL;

+		// For all images pre-loaded into viewer cache, decode them.

+		// Need to do this AFTER we init the sky

+		const S32 DECODE_TIME_SEC = 2;

+		for (int i = 0; i < DECODE_TIME_SEC; i++)

+		{

+			F32 frac = (F32)i / (F32)DECODE_TIME_SEC;

+			set_startup_status(0.45f + frac*0.1f, LLTrans::getString("LoginDecodingImages"), gAgent.mMOTD);

+			display_startup();

+			gTextureList.decodeAllImages(1.f);

+		}

+		LLStartUp::setStartupState( STATE_WORLD_WAIT );

+

+		// JC - Do this as late as possible to increase likelihood Purify

+		// will run.

+		LLMessageSystem* msg = gMessageSystem;

+		if (!msg->mOurCircuitCode)

+		{

+			LL_WARNS("AppInit") << "Attempting to connect to simulator with a zero circuit code!" << LL_ENDL;

+		}

+

+		gUseCircuitCallbackCalled = false;

+

+		msg->enableCircuit(gFirstSim, TRUE);

+		// now, use the circuit info to tell simulator about us!

+		LL_INFOS("AppInit") << "viewer: UserLoginLocationReply() Enabling " << gFirstSim << " with code " << msg->mOurCircuitCode << LL_ENDL;

+		msg->newMessageFast(_PREHASH_UseCircuitCode);

+		msg->nextBlockFast(_PREHASH_CircuitCode);

+		msg->addU32Fast(_PREHASH_Code, msg->mOurCircuitCode);

+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());

+		msg->addUUIDFast(_PREHASH_ID, gAgent.getID());

+		msg->sendReliable(

+			gFirstSim,

+			gSavedSettings.getS32("UseCircuitCodeMaxRetries"),

+			FALSE,

+			gSavedSettings.getF32("UseCircuitCodeTimeout"),

+			use_circuit_callback,

+			NULL);

+

+		timeout.reset();

+

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// Agent Send

+	//---------------------------------------------------------------------

+	if(STATE_WORLD_WAIT == LLStartUp::getStartupState())

+	{

+		LL_DEBUGS("AppInit") << "Waiting for simulator ack...." << LL_ENDL;

+		set_startup_status(0.59f, LLTrans::getString("LoginWaitingForRegionHandshake"), gAgent.mMOTD);

+		if(gGotUseCircuitCodeAck)

+		{

+			LLStartUp::setStartupState( STATE_AGENT_SEND );

+		}

+		LLMessageSystem* msg = gMessageSystem;

+		while (msg->checkAllMessages(gFrameCount, gServicePump))

+		{

+		}

+		msg->processAcks();

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// Agent Send

+	//---------------------------------------------------------------------

+	if (STATE_AGENT_SEND == LLStartUp::getStartupState())

+	{

+		LL_DEBUGS("AppInit") << "Connecting to region..." << LL_ENDL;

+		set_startup_status(0.60f, LLTrans::getString("LoginConnectingToRegion"), gAgent.mMOTD);

+		// register with the message system so it knows we're

+		// expecting this message

+		LLMessageSystem* msg = gMessageSystem;

+		msg->setHandlerFuncFast(

+			_PREHASH_AgentMovementComplete,

+			process_agent_movement_complete);

+		LLViewerRegion* regionp = gAgent.getRegion();

+		if(regionp)

+		{

+			send_complete_agent_movement(regionp->getHost());

+			gAssetStorage->setUpstream(regionp->getHost());

+			gCacheName->setUpstream(regionp->getHost());

+			msg->newMessageFast(_PREHASH_EconomyDataRequest);

+			gAgent.sendReliableMessage();

+		}

+

+		// Create login effect

+		// But not on first login, because you can't see your avatar then

+		if (!gAgent.isFirstLogin())

+		{

+			LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);

+			effectp->setPositionGlobal(gAgent.getPositionGlobal());

+			effectp->setColor(LLColor4U(gAgent.getEffectColor()));

+			LLHUDManager::getInstance()->sendEffects();

+		}

+

+		LLStartUp::setStartupState( STATE_AGENT_WAIT );		// Go to STATE_AGENT_WAIT

+

+		timeout.reset();

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// Agent Wait

+	//---------------------------------------------------------------------

+	if (STATE_AGENT_WAIT == LLStartUp::getStartupState())

+	{

+		LLMessageSystem* msg = gMessageSystem;

+		while (msg->checkAllMessages(gFrameCount, gServicePump))

+		{

+			if (gAgentMovementCompleted)

+			{

+				// Sometimes we have more than one message in the

+				// queue. break out of this loop and continue

+				// processing. If we don't, then this could skip one

+				// or more login steps.

+				break;

+			}

+			else

+			{

+				LL_DEBUGS("AppInit") << "Awaiting AvatarInitComplete, got "

+				<< msg->getMessageName() << LL_ENDL;

+			}

+		}

+		msg->processAcks();

+

+		if (gAgentMovementCompleted)

+		{

+			LLStartUp::setStartupState( STATE_INVENTORY_SEND );

+		}

+

+		return FALSE;

+	}

+

+	//---------------------------------------------------------------------

+	// Inventory Send

+	//---------------------------------------------------------------------

+	if (STATE_INVENTORY_SEND == LLStartUp::getStartupState())

+	{

+		// Inform simulator of our language preference

+		LLAgentLanguage::update();

+

+		// unpack thin inventory

+		LLSD response = LLLoginInstance::getInstance()->getResponse();

+		//bool dump_buffer = false;

+

+		LLSD inv_lib_root = response["inventory-lib-root"];

+		if(inv_lib_root.isDefined())

+		{

+			// should only be one

+			LLSD id = inv_lib_root[0]["folder_id"];

+			if(id.isDefined())

+			{

+				gInventory.setLibraryRootFolderID(id.asUUID());

+			}

+		}

+ 		

+		LLSD inv_lib_owner = response["inventory-lib-owner"];

+		if(inv_lib_owner.isDefined())

+		{

+			// should only be one

+			LLSD id = inv_lib_owner[0]["agent_id"];

+			if(id.isDefined())

+			{

+				gInventory.setLibraryOwnerID( LLUUID(id.asUUID()));

+			}

+		}

+

+		LLSD inv_skel_lib = response["inventory-skel-lib"];

+ 		if(inv_skel_lib.isDefined() && gInventory.getLibraryOwnerID().notNull())

+ 		{

+ 			if(!gInventory.loadSkeleton(inv_skel_lib, gInventory.getLibraryOwnerID()))

+ 			{

+ 				LL_WARNS("AppInit") << "Problem loading inventory-skel-lib" << LL_ENDL;

+ 			}

+ 		}

+

+		LLSD inv_skeleton = response["inventory-skeleton"];

+ 		if(inv_skeleton.isDefined())

+ 		{

+ 			if(!gInventory.loadSkeleton(inv_skeleton, gAgent.getID()))

+ 			{

+ 				LL_WARNS("AppInit") << "Problem loading inventory-skel-targets" << LL_ENDL;

+ 			}

+ 		}

+

+		LLSD buddy_list = response["buddy-list"];

+ 		if(buddy_list.isDefined())

+ 		{

+			LLAvatarTracker::buddy_map_t list;

+			LLUUID agent_id;

+			S32 has_rights = 0, given_rights = 0;

+			for(LLSD::array_const_iterator it = buddy_list.beginArray(),

+				end = buddy_list.endArray(); it != end; ++it)

+			{

+				LLSD buddy_id = (*it)["buddy_id"];

+				if(buddy_id.isDefined())

+				{

+					agent_id = buddy_id.asUUID();

+				}

+

+				LLSD buddy_rights_has = (*it)["buddy_rights_has"];

+				if(buddy_rights_has.isDefined())

+				{

+					has_rights = buddy_rights_has.asInteger();

+				}

+

+				LLSD buddy_rights_given = (*it)["buddy_rights_given"];

+				if(buddy_rights_given.isDefined())

+				{

+					given_rights = buddy_rights_given.asInteger();

+				}

+

+				list[agent_id] = new LLRelationship(given_rights, has_rights, false);

+			}

+			LLAvatarTracker::instance().addBuddyList(list);

+ 		}

+

+		bool show_hud = false;

+		LLSD tutorial_setting = response["tutorial_setting"];

+		if(tutorial_setting.isDefined())

+		{

+			for(LLSD::array_const_iterator it = tutorial_setting.beginArray(),

+				end = tutorial_setting.endArray(); it != end; ++it)

+			{

+				LLSD tutorial_url = (*it)["tutorial_url"];

+				if(tutorial_url.isDefined())

+				{

+					// Tutorial floater will append language code

+					gSavedSettings.setString("TutorialURL", tutorial_url.asString());

+				}

+				

+				// For Viewer 2.0 we are not using the web-based tutorial

+				// If we reverse that decision, put this code back and use

+				// login.cgi to send a different URL with content that matches

+				// the Viewer 2.0 UI.

+				//LLSD use_tutorial = (*it)["use_tutorial"];

+				//if(use_tutorial.asString() == "true")

+				//{

+				//	show_hud = true;

+				//}

+			}

+		}

+		// Either we want to show tutorial because this is the first login

+		// to a Linden Help Island or the user quit with the tutorial

+		// visible.  JC

+		if (show_hud || gSavedSettings.getBOOL("ShowTutorial"))

+		{

+			LLFloaterReg::showInstance("hud", LLSD(), FALSE);

+		}

+

+		LLSD event_notifications = response["event_notifications"];

+		if(event_notifications.isDefined())

+		{

+			gEventNotifier.load(event_notifications);

+		}

+

+		LLSD classified_categories = response["classified_categories"];

+		if(classified_categories.isDefined())

+		{

+			LLClassifiedInfo::loadCategories(classified_categories);

+		}

+

+		// This method MUST be called before gInventory.findCategoryUUIDForType because of 

+		// gInventory.mIsAgentInvUsable is set to true in the gInventory.buildParentChildMap.

+		gInventory.buildParentChildMap();

+

+		//all categories loaded. lets create "My Favorites" category

+		gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE,true);

+

+		// set up callbacks

+		llinfos << "Registering Callbacks" << llendl;

+		LLMessageSystem* msg = gMessageSystem;

+		llinfos << " Inventory" << llendl;

+		LLInventoryModel::registerCallbacks(msg);

+		llinfos << " AvatarTracker" << llendl;

+		LLAvatarTracker::instance().registerCallbacks(msg);

+		llinfos << " Landmark" << llendl;

+		LLLandmark::registerCallbacks(msg);

+

+		// request mute list

+		llinfos << "Requesting Mute List" << llendl;

+		LLMuteList::getInstance()->requestFromServer(gAgent.getID());

+

+		// Get L$ and ownership credit information

+		llinfos << "Requesting Money Balance" << llendl;

+		LLStatusBar::sendMoneyBalanceRequest();

+

+		// request all group information

+		llinfos << "Requesting Agent Data" << llendl;

+		gAgent.sendAgentDataUpdateRequest();

+

+		// Create the inventory views

+		llinfos << "Creating Inventory Views" << llendl;

+		LLFloaterReg::getInstance("inventory");

+

+		LLStartUp::setStartupState( STATE_MISC );

+		return FALSE;

+	}

+

+

+	//---------------------------------------------------------------------

+	// Misc

+	//---------------------------------------------------------------------

+	if (STATE_MISC == LLStartUp::getStartupState())

+	{

+		// We have a region, and just did a big inventory download.

+		// We can estimate the user's connection speed, and set their

+		// max bandwidth accordingly.  JC

+		if (gSavedSettings.getBOOL("FirstLoginThisInstall"))

+		{

+			// This is actually a pessimistic computation, because TCP may not have enough

+			// time to ramp up on the (small) default inventory file to truly measure max

+			// bandwidth. JC

+			F64 rate_bps = LLLoginInstance::getInstance()->getLastTransferRateBPS();

+			const F32 FAST_RATE_BPS = 600.f * 1024.f;

+			const F32 FASTER_RATE_BPS = 750.f * 1024.f;

+			F32 max_bandwidth = gViewerThrottle.getMaxBandwidth();

+			if (rate_bps > FASTER_RATE_BPS

+				&& rate_bps > max_bandwidth)

+			{

+				LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 

+					<< FASTER_RATE_BPS/1024.f 

+					<< " kbps" << LL_ENDL;

+				gViewerThrottle.setMaxBandwidth(FASTER_RATE_BPS / 1024.f);

+			}

+			else if (rate_bps > FAST_RATE_BPS

+				&& rate_bps > max_bandwidth)

+			{

+				LL_DEBUGS("AppInit") << "Fast network connection, increasing max bandwidth to " 

+					<< FAST_RATE_BPS/1024.f 

+					<< " kbps" << LL_ENDL;

+				gViewerThrottle.setMaxBandwidth(FAST_RATE_BPS / 1024.f);

+			}

+

+			// Set the show start location to true, now that the user has logged

+			// on with this install.

+			gSavedSettings.setBOOL("ShowStartLocation", TRUE);

+		}

+

+		// We're successfully logged in.

+		gSavedSettings.setBOOL("FirstLoginThisInstall", FALSE);

+

+		LLFloaterReg::showInitialVisibleInstances();

+

+		// based on the comments, we've successfully logged in so we can delete the 'forced'

+		// URL that the updater set in settings.ini (in a mostly paranoid fashion)

+		std::string nextLoginLocation = gSavedSettings.getString( "NextLoginLocation" );

+		if ( nextLoginLocation.length() )

+		{

+			// clear it

+			gSavedSettings.setString( "NextLoginLocation", "" );

+

+			// and make sure it's saved

+			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );

+			LLUIColorTable::instance().saveUserSettings();

+		};

+

+		if (!gNoRender)

+		{

+			// JC: Initializing audio requests many sounds for download.

+			init_audio();

+

+			// JC: Initialize "active" gestures.  This may also trigger

+			// many gesture downloads, if this is the user's first

+			// time on this machine or -purge has been run.

+			LLSD gesture_options 

+				= LLLoginInstance::getInstance()->getResponse("gestures");

+			if (gesture_options.isDefined())

+			{

+				LL_DEBUGS("AppInit") << "Gesture Manager loading " << gesture_options.size()

+					<< LL_ENDL;

+				uuid_vec_t item_ids;

+				for(LLSD::array_const_iterator resp_it = gesture_options.beginArray(),

+					end = gesture_options.endArray(); resp_it != end; ++resp_it)

+				{

+					// If the id is not specifed in the LLSD,

+					// the LLSD operator[]() will return a null LLUUID. 

+					LLUUID item_id = (*resp_it)["item_id"];

+					LLUUID asset_id = (*resp_it)["asset_id"];

+

+					if (item_id.notNull() && asset_id.notNull())

+					{

+						// Could schedule and delay these for later.

+						const BOOL no_inform_server = FALSE;

+						const BOOL no_deactivate_similar = FALSE;

+						LLGestureMgr::instance().activateGestureWithAsset(item_id, asset_id,

+											 no_inform_server,

+											 no_deactivate_similar);

+						// We need to fetch the inventory items for these gestures

+						// so we have the names to populate the UI.

+						item_ids.push_back(item_id);

+					}

+				}

+				// no need to add gesture to inventory observer, it's already made in constructor 

+				LLGestureMgr::instance().setFetchIDs(item_ids);

+				LLGestureMgr::instance().startFetch();

+			}

+		}

+		gDisplaySwapBuffers = TRUE;

+

+		LLMessageSystem* msg = gMessageSystem;

+		msg->setHandlerFuncFast(_PREHASH_SoundTrigger,				process_sound_trigger);

+		msg->setHandlerFuncFast(_PREHASH_PreloadSound,				process_preload_sound);

+		msg->setHandlerFuncFast(_PREHASH_AttachedSound,				process_attached_sound);

+		msg->setHandlerFuncFast(_PREHASH_AttachedSoundGainChange,	process_attached_sound_gain_change);

+

+		LL_DEBUGS("AppInit") << "Initialization complete" << LL_ENDL;

+

+		gRenderStartTime.reset();

+		gForegroundTime.reset();

+

+		// HACK: Inform simulator of window size.

+		// Do this here so it's less likely to race with RegisterNewAgent.

+		// TODO: Put this into RegisterNewAgent

+		// JC - 7/20/2002

+		gViewerWindow->sendShapeToSim();

+

+		

+		// Ignore stipend information for now.  Money history is on the web site.

+		// if needed, show the L$ history window

+		//if (stipend_since_login && !gNoRender)

+		//{

+		//}

+

+		// The reason we show the alert is because we want to

+		// reduce confusion for when you log in and your provided

+		// location is not your expected location. So, if this is

+		// your first login, then you do not have an expectation,

+		// thus, do not show this alert.

+		if (!gAgent.isFirstLogin())

+		{

+			llinfos << "gAgentStartLocation : " << gAgentStartLocation << llendl;

+			LLSLURL start_slurl = LLStartUp::getStartSLURL();

+			

+			if (((start_slurl.getType() == LLSLURL::LOCATION) && (gAgentStartLocation == "url")) ||

+				((start_slurl.getType() == LLSLURL::LAST_LOCATION) && (gAgentStartLocation == "last")) ||

+				((start_slurl.getType() == LLSLURL::HOME_LOCATION) && (gAgentStartLocation == "home")))

+			{

+				// Start location is OK

+				// Disabled code to restore camera location and focus if logging in to default location

+				static bool samename = false;

+				if (samename)

+				{

+					// restore old camera pos

+					gAgentCamera.setFocusOnAvatar(FALSE, FALSE);

+					gAgentCamera.setCameraPosAndFocusGlobal(gSavedSettings.getVector3d("CameraPosOnLogout"), gSavedSettings.getVector3d("FocusPosOnLogout"), LLUUID::null);

+					BOOL limit_hit = FALSE;

+					gAgentCamera.calcCameraPositionTargetGlobal(&limit_hit);

+					if (limit_hit)

+					{

+						gAgentCamera.setFocusOnAvatar(TRUE, FALSE);

+					}

+					gAgentCamera.stopCameraAnimation();

+				}

+			}

+			else

+			{

+				std::string msg;

+				switch(start_slurl.getType())

+				{

+					case LLSLURL::LOCATION:

+					{

+						

+						msg = "AvatarMovedDesired";

+						break;

+					}

+					case LLSLURL::HOME_LOCATION:

+					{

+						msg = "AvatarMovedHome";

+						break;

+					}

+					default:

+					{

+						msg = "AvatarMovedLast";

+					}

+				}

+				LLNotificationsUtil::add(msg);

+			}

+		}

+

+        //DEV-17797.  get null folder.  Any items found here moved to Lost and Found

+        LLInventoryModelBackgroundFetch::instance().findLostItems();

+

+		LLStartUp::setStartupState( STATE_PRECACHE );

+		timeout.reset();

+		return FALSE;

+	}

+

+	if (STATE_PRECACHE == LLStartUp::getStartupState())

+	{

+		F32 timeout_frac = timeout.getElapsedTimeF32()/PRECACHING_DELAY;

+

+		// We now have an inventory skeleton, so if this is a user's first

+		// login, we can start setting up their clothing and avatar 

+		// appearance.  This helps to avoid the generic "Ruth" avatar in

+		// the orientation island tutorial experience. JC

+		if (gAgent.isFirstLogin()

+			&& !sInitialOutfit.empty()    // registration set up an outfit

+			&& !sInitialOutfitGender.empty() // and a gender

+			&& isAgentAvatarValid()	  // can't wear clothes without object

+			&& !gAgent.isGenderChosen() ) // nothing already loading

+		{

+			// Start loading the wearables, textures, gestures

+			LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );

+		}

+

+		// wait precache-delay and for agent's avatar or a lot longer.

+		if(((timeout_frac > 1.f) && isAgentAvatarValid())

+		   || (timeout_frac > 3.f))

+		{

+			LLStartUp::setStartupState( STATE_WEARABLES_WAIT );

+		}

+		else

+		{

+			update_texture_fetch();

+			set_startup_status(0.60f + 0.30f * timeout_frac,

+				LLTrans::getString("LoginPrecaching"),

+					gAgent.mMOTD);

+			display_startup();

+			if (!LLViewerShaderMgr::sInitialized)

+			{

+				LLViewerShaderMgr::sInitialized = TRUE;

+				LLViewerShaderMgr::instance()->setShaders();

+			}

+		}

+		

+		return TRUE;

+	}

+

+	if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())

+	{

+		static LLFrameTimer wearables_timer;

+

+		const F32 wearables_time = wearables_timer.getElapsedTimeF32();

+		const F32 MAX_WEARABLES_TIME = 10.f;

+

+		if (!gAgent.isGenderChosen())

+		{

+			// No point in waiting for clothing, we don't even

+			// know what gender we are.  Pop a dialog to ask and

+			// proceed to draw the world. JC

+			//

+			// *NOTE: We might hit this case even if we have an

+			// initial outfit, but if the load hasn't started

+			// already then something is wrong so fall back

+			// to generic outfits. JC

+			LLNotificationsUtil::add("WelcomeChooseSex", LLSD(), LLSD(),

+				callback_choose_gender);

+			LLStartUp::setStartupState( STATE_CLEANUP );

+			return TRUE;

+		}

+		

+		if (wearables_time > MAX_WEARABLES_TIME)

+		{

+			LLNotificationsUtil::add("ClothingLoading");

+			LLViewerStats::getInstance()->incStat(LLViewerStats::ST_WEARABLES_TOO_LONG);

+			LLStartUp::setStartupState( STATE_CLEANUP );

+			return TRUE;

+		}

+

+		if (gAgent.isFirstLogin())

+		{

+			// wait for avatar to be completely loaded

+			if (isAgentAvatarValid()

+				&& gAgentAvatarp->isFullyLoaded())

+			{

+				//llinfos << "avatar fully loaded" << llendl;

+				LLStartUp::setStartupState( STATE_CLEANUP );

+				return TRUE;

+			}

+		}

+		else

+		{

+			// OK to just get the wearables

+			if ( gAgentWearables.areWearablesLoaded() )

+			{

+				// We have our clothing, proceed.

+				//llinfos << "wearables loaded" << llendl;

+				LLStartUp::setStartupState( STATE_CLEANUP );

+				return TRUE;

+			}

+		}

+

+		update_texture_fetch();

+		set_startup_status(0.9f + 0.1f * wearables_time / MAX_WEARABLES_TIME,

+						 LLTrans::getString("LoginDownloadingClothing").c_str(),

+						 gAgent.mMOTD.c_str());

+		return TRUE;

+	}

+

+	if (STATE_CLEANUP == LLStartUp::getStartupState())

+	{

+		set_startup_status(1.0, "", "");

+

+		// Let the map know about the inventory.

+		LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();

+		if(floater_world_map)

+		{

+			floater_world_map->observeInventory(&gInventory);

+			floater_world_map->observeFriends();

+		}

+		gViewerWindow->showCursor();

+		gViewerWindow->getWindow()->resetBusyCount();

+		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);

+		LL_DEBUGS("AppInit") << "Done releasing bitmap" << LL_ENDL;

+		gViewerWindow->setShowProgress(FALSE);

+		gViewerWindow->setProgressCancelButtonVisible(FALSE);

+

+		// We're not away from keyboard, even though login might have taken

+		// a while. JC

+		gAgent.clearAFK();

+

+		// Have the agent start watching the friends list so we can update proxies

+		gAgent.observeFriends();

+		if (gSavedSettings.getBOOL("LoginAsGod"))

+		{

+			gAgent.requestEnterGodMode();

+		}

+		

+		// Start automatic replay if the flag is set.

+		if (gSavedSettings.getBOOL("StatsAutoRun") || LLAgentPilot::sReplaySession)

+		{

+			LLUUID id;

+			LL_DEBUGS("AppInit") << "Starting automatic playback" << LL_ENDL;

+			gAgentPilot.startPlayback();

+		}

+

+		show_debug_menus(); // Debug menu visiblity and First Use trigger

+		

+		// If we've got a startup URL, dispatch it

+		LLStartUp::dispatchURL();

+

+		// Retrieve information about the land data

+		// (just accessing this the first time will fetch it,

+		// then the data is cached for the viewer's lifetime)

+		LLProductInfoRequestManager::instance();

+		

+		// *FIX:Mani - What do I do here?

+		// Need we really clear the Auth response data?

+		// Clean up the userauth stuff.

+		// LLUserAuth::getInstance()->reset();

+

+		LLStartUp::setStartupState( STATE_STARTED );

+

+		// Unmute audio if desired and setup volumes.

+		// Unmute audio if desired and setup volumes.

+		// This is a not-uncommon crash site, so surround it with

+		// llinfos output to aid diagnosis.

+		LL_INFOS("AppInit") << "Doing first audio_update_volume..." << LL_ENDL;

+		audio_update_volume();

+		LL_INFOS("AppInit") << "Done first audio_update_volume." << LL_ENDL;

+

+		// reset keyboard focus to sane state of pointing at world

+		gFocusMgr.setKeyboardFocus(NULL);

+

+#if 0 // sjb: enable for auto-enabling timer display 

+		gDebugView->mFastTimerView->setVisible(TRUE);

+#endif

+

+		LLAppViewer::instance()->handleLoginComplete();

+

+		// reset timers now that we are running "logged in" logic

+		LLFastTimer::reset();

+

+		LLAgentPicksInfo::getInstance()->requestNumberOfPicks();

+

+		LLIMFloater::initIMFloater();

+

+		return TRUE;

+	}

+

+	LL_WARNS("AppInit") << "Reached end of idle_startup for state " << LLStartUp::getStartupState() << LL_ENDL;

+	return TRUE;

+}

+

+//

+// local function definition

+//

+

+void login_show()

+{

+	LL_INFOS("AppInit") << "Initializing Login Screen" << LL_ENDL;

+

+#ifdef LL_RELEASE_FOR_DOWNLOAD

+	BOOL bUseDebugLogin = gSavedSettings.getBOOL("UseDebugLogin");

+#else

+	BOOL bUseDebugLogin = TRUE;

+#endif

+

+	LLPanelLogin::show(	gViewerWindow->getWindowRectScaled(),

+						bUseDebugLogin || gSavedSettings.getBOOL("SecondLifeEnterprise"),

+						login_callback, NULL );

+

+}

+

+// Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.

+void login_callback(S32 option, void *userdata)

+{

+	const S32 CONNECT_OPTION = 0;

+	const S32 QUIT_OPTION = 1;

+

+	if (CONNECT_OPTION == option)

+	{

+		LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );

+		return;

+	}

+	else if (QUIT_OPTION == option) // *TODO: THIS CODE SEEMS TO BE UNREACHABLE!!!!! login_callback is never called with option equal to QUIT_OPTION

+	{

+		if (!gSavedSettings.getBOOL("RememberPassword"))

+		{

+			// turn off the setting and write out to disk

+			gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );

+			LLUIColorTable::instance().saveUserSettings();

+		}

+

+		// Next iteration through main loop should shut down the app cleanly.

+		LLAppViewer::instance()->userQuit();

+		

+		if (LLAppViewer::instance()->quitRequested())

+		{

+			LLPanelLogin::closePanel();

+		}

+		return;

+	}

+	else

+	{

+		LL_WARNS("AppInit") << "Unknown login button clicked" << LL_ENDL;

+	}

+}

+

+void show_first_run_dialog()

+{

+	LLNotificationsUtil::add("FirstRun", LLSD(), LLSD(), first_run_dialog_callback);

+}

+

+bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)

+{

+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);

+	if (0 == option)

+	{

+		LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;

+		LLWeb::loadURLExternal(LLTrans::getString("create_account_url") );

+	}

+

+	LLPanelLogin::giveFocus();

+	return false;

+}

+

+

+

+void set_startup_status(const F32 frac, const std::string& string, const std::string& msg)

+{

+	gViewerWindow->setProgressPercent(frac*100);

+	gViewerWindow->setProgressString(string);

+

+	gViewerWindow->setProgressMessage(msg);

+}

+

+bool login_alert_status(const LLSD& notification, const LLSD& response)

+{

+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);

+    // Buttons

+    switch( option )

+    {

+        case 0:     // OK

+            break;

+      //  case 1:     // Help

+      //      LLWeb::loadURL(LLNotifications::instance().getGlobalString("SUPPORT_URL") );

+      //      break;

+        case 2:     // Teleport

+            // Restart the login process, starting at our home locaton

+	  LLStartUp::setStartSLURL(LLSLURL(LLSLURL::SIM_LOCATION_HOME));

+            LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );

+            break;

+        default:

+            LL_WARNS("AppInit") << "Missing case in login_alert_status switch" << LL_ENDL;

+    }

+

+	LLPanelLogin::giveFocus();

+	return false;

+}

+

+

+void use_circuit_callback(void**, S32 result)

+{

+	// bail if we're quitting.

+	if(LLApp::isExiting()) return;

+	if( !gUseCircuitCallbackCalled )

+	{

+		gUseCircuitCallbackCalled = true;

+		if (result)

+		{

+			// Make sure user knows something bad happened. JC

+			LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL;

+			LLNotificationsUtil::add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);

+			reset_login();

+		}

+		else

+		{

+			gGotUseCircuitCodeAck = true;

+		}

+	}

+}

+

+void register_viewer_callbacks(LLMessageSystem* msg)

+{

+	msg->setHandlerFuncFast(_PREHASH_LayerData,				process_layer_data );

+	msg->setHandlerFuncFast(_PREHASH_ImageData,				LLViewerTextureList::receiveImageHeader );

+	msg->setHandlerFuncFast(_PREHASH_ImagePacket,				LLViewerTextureList::receiveImagePacket );

+	msg->setHandlerFuncFast(_PREHASH_ObjectUpdate,				process_object_update );

+	msg->setHandlerFunc("ObjectUpdateCompressed",				process_compressed_object_update );

+	msg->setHandlerFunc("ObjectUpdateCached",					process_cached_object_update );

+	msg->setHandlerFuncFast(_PREHASH_ImprovedTerseObjectUpdate, process_terse_object_update_improved );

+	msg->setHandlerFunc("SimStats",				process_sim_stats);

+	msg->setHandlerFuncFast(_PREHASH_HealthMessage,			process_health_message );

+	msg->setHandlerFuncFast(_PREHASH_EconomyData,				process_economy_data);

+	msg->setHandlerFunc("RegionInfo", LLViewerRegion::processRegionInfo);

+

+	msg->setHandlerFuncFast(_PREHASH_ChatFromSimulator,		process_chat_from_simulator);

+	msg->setHandlerFuncFast(_PREHASH_KillObject,				process_kill_object,	NULL);

+	msg->setHandlerFuncFast(_PREHASH_SimulatorViewerTimeMessage,	process_time_synch,		NULL);

+	msg->setHandlerFuncFast(_PREHASH_EnableSimulator,			process_enable_simulator);

+	msg->setHandlerFuncFast(_PREHASH_DisableSimulator,			process_disable_simulator);

+	msg->setHandlerFuncFast(_PREHASH_KickUser,					process_kick_user,		NULL);

+

+	msg->setHandlerFunc("CrossedRegion", process_crossed_region);

+	msg->setHandlerFuncFast(_PREHASH_TeleportFinish, process_teleport_finish);

+

+	msg->setHandlerFuncFast(_PREHASH_AlertMessage,             process_alert_message);

+	msg->setHandlerFunc("AgentAlertMessage", process_agent_alert_message);

+	msg->setHandlerFuncFast(_PREHASH_MeanCollisionAlert,             process_mean_collision_alert_message,  NULL);

+	msg->setHandlerFunc("ViewerFrozenMessage",             process_frozen_message);

+

+	msg->setHandlerFuncFast(_PREHASH_NameValuePair,			process_name_value);

+	msg->setHandlerFuncFast(_PREHASH_RemoveNameValuePair,	process_remove_name_value);

+	msg->setHandlerFuncFast(_PREHASH_AvatarAnimation,		process_avatar_animation);

+	msg->setHandlerFuncFast(_PREHASH_AvatarAppearance,		process_avatar_appearance);

+	msg->setHandlerFunc("AgentCachedTextureResponse",	LLAgent::processAgentCachedTextureResponse);

+	msg->setHandlerFunc("RebakeAvatarTextures", LLVOAvatarSelf::processRebakeAvatarTextures);

+	msg->setHandlerFuncFast(_PREHASH_CameraConstraint,		process_camera_constraint);

+	msg->setHandlerFuncFast(_PREHASH_AvatarSitResponse,		process_avatar_sit_response);

+	msg->setHandlerFunc("SetFollowCamProperties",			process_set_follow_cam_properties);

+	msg->setHandlerFunc("ClearFollowCamProperties",			process_clear_follow_cam_properties);

+

+	msg->setHandlerFuncFast(_PREHASH_ImprovedInstantMessage,	process_improved_im);

+	msg->setHandlerFuncFast(_PREHASH_ScriptQuestion,			process_script_question);

+	msg->setHandlerFuncFast(_PREHASH_ObjectProperties,			LLSelectMgr::processObjectProperties, NULL);

+	msg->setHandlerFuncFast(_PREHASH_ObjectPropertiesFamily,	LLSelectMgr::processObjectPropertiesFamily, NULL);

+	msg->setHandlerFunc("ForceObjectSelect", LLSelectMgr::processForceObjectSelect);

+

+	msg->setHandlerFuncFast(_PREHASH_MoneyBalanceReply,		process_money_balance_reply,	NULL);

+	msg->setHandlerFuncFast(_PREHASH_CoarseLocationUpdate,		LLWorld::processCoarseUpdate, NULL);

+	msg->setHandlerFuncFast(_PREHASH_ReplyTaskInventory, 		LLViewerObject::processTaskInv,	NULL);

+	msg->setHandlerFuncFast(_PREHASH_DerezContainer,			process_derez_container, NULL);

+	msg->setHandlerFuncFast(_PREHASH_ScriptRunningReply,

+						&LLLiveLSLEditor::processScriptRunningReply);

+

+	msg->setHandlerFuncFast(_PREHASH_DeRezAck, process_derez_ack);

+

+	msg->setHandlerFunc("LogoutReply", process_logout_reply);

+

+	//msg->setHandlerFuncFast(_PREHASH_AddModifyAbility,

+	//					&LLAgent::processAddModifyAbility);

+	//msg->setHandlerFuncFast(_PREHASH_RemoveModifyAbility,

+	//					&LLAgent::processRemoveModifyAbility);

+	msg->setHandlerFuncFast(_PREHASH_AgentDataUpdate,

+						&LLAgent::processAgentDataUpdate);

+	msg->setHandlerFuncFast(_PREHASH_AgentGroupDataUpdate,

+						&LLAgent::processAgentGroupDataUpdate);

+	msg->setHandlerFunc("AgentDropGroup",

+						&LLAgent::processAgentDropGroup);

+	// land ownership messages

+	msg->setHandlerFuncFast(_PREHASH_ParcelOverlay,

+						LLViewerParcelMgr::processParcelOverlay);

+	msg->setHandlerFuncFast(_PREHASH_ParcelProperties,

+						LLViewerParcelMgr::processParcelProperties);

+	msg->setHandlerFunc("ParcelAccessListReply",

+		LLViewerParcelMgr::processParcelAccessListReply);

+	msg->setHandlerFunc("ParcelDwellReply",

+		LLViewerParcelMgr::processParcelDwellReply);

+

+	msg->setHandlerFunc("AvatarPropertiesReply",

+						&LLAvatarPropertiesProcessor::processAvatarPropertiesReply);

+	msg->setHandlerFunc("AvatarInterestsReply",

+						&LLAvatarPropertiesProcessor::processAvatarInterestsReply);

+	msg->setHandlerFunc("AvatarGroupsReply",

+						&LLAvatarPropertiesProcessor::processAvatarGroupsReply);

+	// ratings deprecated

+	//msg->setHandlerFuncFast(_PREHASH_AvatarStatisticsReply,

+	//					LLPanelAvatar::processAvatarStatisticsReply);

+	msg->setHandlerFunc("AvatarNotesReply",

+						&LLAvatarPropertiesProcessor::processAvatarNotesReply);

+	msg->setHandlerFunc("AvatarPicksReply",

+						&LLAvatarPropertiesProcessor::processAvatarPicksReply);

+ 	msg->setHandlerFunc("AvatarClassifiedReply",

+ 						&LLAvatarPropertiesProcessor::processAvatarClassifiedsReply);

+

+	msg->setHandlerFuncFast(_PREHASH_CreateGroupReply,

+						LLGroupMgr::processCreateGroupReply);

+	msg->setHandlerFuncFast(_PREHASH_JoinGroupReply,

+						LLGroupMgr::processJoinGroupReply);

+	msg->setHandlerFuncFast(_PREHASH_EjectGroupMemberReply,

+						LLGroupMgr::processEjectGroupMemberReply);

+	msg->setHandlerFuncFast(_PREHASH_LeaveGroupReply,

+						LLGroupMgr::processLeaveGroupReply);

+	msg->setHandlerFuncFast(_PREHASH_GroupProfileReply,

+						LLGroupMgr::processGroupPropertiesReply);

+

+	// ratings deprecated

+	// msg->setHandlerFuncFast(_PREHASH_ReputationIndividualReply,

+	//					LLFloaterRate::processReputationIndividualReply);

+

+	msg->setHandlerFuncFast(_PREHASH_AgentWearablesUpdate,

+						LLAgentWearables::processAgentInitialWearablesUpdate );

+

+	msg->setHandlerFunc("ScriptControlChange",

+						LLAgent::processScriptControlChange );

+

+	msg->setHandlerFuncFast(_PREHASH_ViewerEffect, LLHUDManager::processViewerEffect);

+

+	msg->setHandlerFuncFast(_PREHASH_GrantGodlikePowers, process_grant_godlike_powers);

+

+	msg->setHandlerFuncFast(_PREHASH_GroupAccountSummaryReply,

+							LLPanelGroupLandMoney::processGroupAccountSummaryReply);

+	msg->setHandlerFuncFast(_PREHASH_GroupAccountDetailsReply,

+							LLPanelGroupLandMoney::processGroupAccountDetailsReply);

+	msg->setHandlerFuncFast(_PREHASH_GroupAccountTransactionsReply,

+							LLPanelGroupLandMoney::processGroupAccountTransactionsReply);

+

+	msg->setHandlerFuncFast(_PREHASH_UserInfoReply,

+		process_user_info_reply);

+

+	msg->setHandlerFunc("RegionHandshake", process_region_handshake, NULL);

+

+	msg->setHandlerFunc("TeleportStart", process_teleport_start );

+	msg->setHandlerFunc("TeleportProgress", process_teleport_progress);

+	msg->setHandlerFunc("TeleportFailed", process_teleport_failed, NULL);

+	msg->setHandlerFunc("TeleportLocal", process_teleport_local, NULL);

+

+	msg->setHandlerFunc("ImageNotInDatabase", LLViewerTextureList::processImageNotInDatabase, NULL);

+

+	msg->setHandlerFuncFast(_PREHASH_GroupMembersReply,

+						LLGroupMgr::processGroupMembersReply);

+	msg->setHandlerFunc("GroupRoleDataReply",

+						LLGroupMgr::processGroupRoleDataReply);

+	msg->setHandlerFunc("GroupRoleMembersReply",

+						LLGroupMgr::processGroupRoleMembersReply);

+	msg->setHandlerFunc("GroupTitlesReply",

+						LLGroupMgr::processGroupTitlesReply);

+	// Special handler as this message is sometimes used for group land.

+	msg->setHandlerFunc("PlacesReply", process_places_reply);

+	msg->setHandlerFunc("GroupNoticesListReply", LLPanelGroupNotices::processGroupNoticesListReply);

+

+	msg->setHandlerFunc("AvatarPickerReply", LLFloaterAvatarPicker::processAvatarPickerReply);

+

+	msg->setHandlerFunc("MapBlockReply", LLWorldMapMessage::processMapBlockReply);

+	msg->setHandlerFunc("MapItemReply", LLWorldMapMessage::processMapItemReply);

+	msg->setHandlerFunc("EventInfoReply", LLEventNotifier::processEventInfoReply);

+	

+	msg->setHandlerFunc("PickInfoReply", &LLAvatarPropertiesProcessor::processPickInfoReply);

+//	msg->setHandlerFunc("ClassifiedInfoReply", LLPanelClassified::processClassifiedInfoReply);

+	msg->setHandlerFunc("ClassifiedInfoReply", LLAvatarPropertiesProcessor::processClassifiedInfoReply);

+	msg->setHandlerFunc("ParcelInfoReply", LLRemoteParcelInfoProcessor::processParcelInfoReply);

+	msg->setHandlerFunc("ScriptDialog", process_script_dialog);

+	msg->setHandlerFunc("LoadURL", process_load_url);

+	msg->setHandlerFunc("ScriptTeleportRequest", process_script_teleport_request);

+	msg->setHandlerFunc("EstateCovenantReply", process_covenant_reply);

+

+	// calling cards

+	msg->setHandlerFunc("OfferCallingCard", process_offer_callingcard);

+	msg->setHandlerFunc("AcceptCallingCard", process_accept_callingcard);

+	msg->setHandlerFunc("DeclineCallingCard", process_decline_callingcard);

+

+	msg->setHandlerFunc("ParcelObjectOwnersReply", LLPanelLandObjects::processParcelObjectOwnersReply);

+

+	msg->setHandlerFunc("InitiateDownload", process_initiate_download);

+	msg->setHandlerFunc("LandStatReply", LLFloaterTopObjects::handle_land_reply);

+	msg->setHandlerFunc("GenericMessage", process_generic_message);

+

+	msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);

+}

+

+void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)

+{

+	// nothing

+}

+

+// *HACK: Must match name in Library or agent inventory

+const std::string ROOT_GESTURES_FOLDER = "Gestures";

+const std::string COMMON_GESTURES_FOLDER = "Common Gestures";

+const std::string MALE_GESTURES_FOLDER = "Male Gestures";

+const std::string FEMALE_GESTURES_FOLDER = "Female Gestures";

+const std::string SPEECH_GESTURES_FOLDER = "Speech Gestures";

+const std::string OTHER_GESTURES_FOLDER = "Other Gestures";

+const S32 OPT_CLOSED_WINDOW = -1;

+const S32 OPT_MALE = 0;

+const S32 OPT_FEMALE = 1;

+const S32 OPT_TRUST_CERT = 0;

+const S32 OPT_CANCEL_TRUST = 1;

+	

+bool callback_choose_gender(const LLSD& notification, const LLSD& response)

+{

+	

+    // These defaults are returned from the server on login.  They are set in login.xml.                  

+    // If no default is returned from the server, they are retrieved from settings.xml.                   

+	

+	S32 option = LLNotification::getSelectedOption(notification, response);

+	switch(option)

+	{

+		case OPT_MALE:

+			LLStartUp::loadInitialOutfit( gSavedSettings.getString("DefaultMaleAvatar"), "male" );

+			break;

+			

+        case OPT_FEMALE:

+        case OPT_CLOSED_WINDOW:

+        default:

+			LLStartUp::loadInitialOutfit( gSavedSettings.getString("DefaultFemaleAvatar"), "female" );

+			break;

+	}

+	return false;

+}

+

+void LLStartUp::copyLibraryGestures(const std::string& same_gender_gestures)

+{

+	llinfos << "Copying library gestures" << llendl;

+

+	// Copy gestures

+	LLUUID lib_gesture_cat_id =

+		gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE,false,true);

+	if (lib_gesture_cat_id.isNull())

+	{

+		llwarns << "Unable to copy gestures, source category not found" << llendl;

+	}

+	LLUUID dst_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE);

+

+	std::vector<std::string> gesture_folders_to_copy;

+	gesture_folders_to_copy.push_back(MALE_GESTURES_FOLDER);

+	gesture_folders_to_copy.push_back(FEMALE_GESTURES_FOLDER);

+	gesture_folders_to_copy.push_back(COMMON_GESTURES_FOLDER);

+	gesture_folders_to_copy.push_back(SPEECH_GESTURES_FOLDER);

+	gesture_folders_to_copy.push_back(OTHER_GESTURES_FOLDER);

+

+	for(std::vector<std::string>::iterator it = gesture_folders_to_copy.begin();

+		it != gesture_folders_to_copy.end();

+		++it)

+	{

+		std::string& folder_name = *it;

+

+		LLPointer<LLInventoryCallback> cb(NULL);

+

+		if (folder_name == same_gender_gestures ||

+			folder_name == COMMON_GESTURES_FOLDER ||

+			folder_name == OTHER_GESTURES_FOLDER)

+		{

+			cb = new ActivateGestureCallback;

+		}

+

+

+		LLUUID cat_id = findDescendentCategoryIDByName(lib_gesture_cat_id,folder_name);

+		if (cat_id.isNull())

+		{

+			llwarns << "failed to find gesture folder for " << folder_name << llendl;

+		}

+		else

+		{

+			llinfos << "initiating fetch and copy for " << folder_name << " cat_id " << cat_id << llendl;

+			LLAppearanceMgr* app_mgr = LLAppearanceMgr::getInstance();

+			callAfterCategoryFetch(cat_id,

+								   boost::bind(&LLAppearanceMgr::shallowCopyCategory,

+											   app_mgr,

+											   cat_id,

+											   dst_id,

+											   cb));

+		}

+	}

+}

+

+void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,

+								   const std::string& gender_name )

+{

+	llinfos << "starting" << llendl;

+

+	// Not going through the processAgentInitialWearables path, so need to set this here.

+	LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true);

+	// Initiate creation of COF, since we're also bypassing that.

+	gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);

+	

+	S32 gender = 0;

+	std::string same_gender_gestures;

+	if (gender_name == "male")

+	{

+		gender = OPT_MALE;

+		same_gender_gestures = MALE_GESTURES_FOLDER;

+	}

+	else

+	{

+		gender = OPT_FEMALE;

+		same_gender_gestures = FEMALE_GESTURES_FOLDER;

+	}

+

+	// try to find the outfit - if not there, create some default

+	// wearables.

+	LLUUID cat_id = findDescendentCategoryIDByName(

+		gInventory.getLibraryRootFolderID(),

+		outfit_folder_name);

+	if (cat_id.isNull())

+	{

+		gAgentWearables.createStandardWearables(gender);

+	}

+	else

+	{

+		sWearablesLoadedCon = gAgentWearables.addLoadedCallback(LLStartUp::saveInitialOutfit);

+

+		bool do_copy = true;

+		bool do_append = false;

+		LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);

+		LLAppearanceMgr::instance().wearInventoryCategory(cat, do_copy, do_append);

+	}

+

+	// Copy gestures

+	copyLibraryGestures(same_gender_gestures);

+	

+	// This is really misnamed -- it means we have started loading

+	// an outfit/shape that will give the avatar a gender eventually. JC

+	gAgent.setGenderChosen(TRUE);

+

+}

+

+//static

+void LLStartUp::saveInitialOutfit()

+{

+	if (sInitialOutfit.empty()) return;

+	

+	if (sWearablesLoadedCon.connected())

+	{

+		sWearablesLoadedCon.disconnect();

+	}

+	LLAppearanceMgr::getInstance()->makeNewOutfitLinks(sInitialOutfit,false);

+}

+

+std::string& LLStartUp::getInitialOutfitName()

+{

+	return sInitialOutfit;

+}

+

+// Loads a bitmap to display during load

+void init_start_screen(S32 location_id)

+{

+	if (gStartTexture.notNull())

+	{

+		gStartTexture = NULL;

+		LL_INFOS("AppInit") << "re-initializing start screen" << LL_ENDL;

+	}

+

+	LL_DEBUGS("AppInit") << "Loading startup bitmap..." << LL_ENDL;

+

+	std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();

+

+	if ((S32)START_LOCATION_ID_LAST == location_id)

+	{

+		temp_str += SCREEN_LAST_FILENAME;

+	}

+	else

+	{

+		temp_str += SCREEN_HOME_FILENAME;

+	}

+

+	LLPointer<LLImageBMP> start_image_bmp = new LLImageBMP;

+	

+	// Turn off start screen to get around the occasional readback 

+	// driver bug

+	if(!gSavedSettings.getBOOL("UseStartScreen"))

+	{

+		LL_INFOS("AppInit")  << "Bitmap load disabled" << LL_ENDL;

+		return;

+	}

+	else if(!start_image_bmp->load(temp_str) )

+	{

+		LL_WARNS("AppInit") << "Bitmap load failed" << LL_ENDL;

+		return;

+	}

+

+	gStartImageWidth = start_image_bmp->getWidth();

+	gStartImageHeight = start_image_bmp->getHeight();

+

+	LLPointer<LLImageRaw> raw = new LLImageRaw;

+	if (!start_image_bmp->decode(raw, 0.0f))

+	{

+		LL_WARNS("AppInit") << "Bitmap decode failed" << LL_ENDL;

+		gStartTexture = NULL;

+		return;

+	}

+

+	raw->expandToPowerOfTwo();

+	gStartTexture = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE) ;

+}

+

+

+// frees the bitmap

+void release_start_screen()

+{

+	LL_DEBUGS("AppInit") << "Releasing bitmap..." << LL_ENDL;

+	gStartTexture = NULL;

+}

+

+

+// static

+std::string LLStartUp::startupStateToString(EStartupState state)

+{

+#define RTNENUM(E) case E: return #E

+	switch(state){

+		RTNENUM( STATE_FIRST );

+		RTNENUM( STATE_BROWSER_INIT );

+		RTNENUM( STATE_LOGIN_SHOW );

+		RTNENUM( STATE_LOGIN_WAIT );

+		RTNENUM( STATE_LOGIN_CLEANUP );

+		RTNENUM( STATE_LOGIN_AUTH_INIT );

+		RTNENUM( STATE_LOGIN_CURL_UNSTUCK );

+		RTNENUM( STATE_LOGIN_PROCESS_RESPONSE );

+		RTNENUM( STATE_WORLD_INIT );

+		RTNENUM( STATE_MULTIMEDIA_INIT );

+		RTNENUM( STATE_FONT_INIT );

+		RTNENUM( STATE_SEED_GRANTED_WAIT );

+		RTNENUM( STATE_SEED_CAP_GRANTED );

+		RTNENUM( STATE_WORLD_WAIT );

+		RTNENUM( STATE_AGENT_SEND );

+		RTNENUM( STATE_AGENT_WAIT );

+		RTNENUM( STATE_INVENTORY_SEND );

+		RTNENUM( STATE_MISC );

+		RTNENUM( STATE_PRECACHE );

+		RTNENUM( STATE_WEARABLES_WAIT );

+		RTNENUM( STATE_CLEANUP );

+		RTNENUM( STATE_STARTED );

+	default:

+		return llformat("(state #%d)", state);

+	}

+#undef RTNENUM

+}

+

+// static

+void LLStartUp::setStartupState( EStartupState state )

+{

+	LL_INFOS("AppInit") << "Startup state changing from " <<  

+		getStartupStateString() << " to " <<  

+		startupStateToString(state) << LL_ENDL;

+	gStartupState = state;

+	postStartupState();

+}

+

+void LLStartUp::postStartupState()

+{

+	LLSD stateInfo;

+	stateInfo["str"] = getStartupStateString();

+	stateInfo["enum"] = gStartupState;

+	sStateWatcher->post(stateInfo);

+}

+

+

+void reset_login()

+{

+	gAgentWearables.cleanup();

+	gAgentCamera.cleanup();

+	gAgent.cleanup();

+	LLWorld::getInstance()->destroyClass();

+

+	LLStartUp::setStartupState( STATE_LOGIN_SHOW );

+

+	if ( gViewerWindow )

+	{	// Hide menus and normal buttons

+		gViewerWindow->setNormalControlsVisible( FALSE );

+		gLoginMenuBarView->setVisible( TRUE );

+		gLoginMenuBarView->setEnabled( TRUE );

+	}

+

+	// Hide any other stuff

+	LLFloaterReg::hideVisibleInstances();

+}

+

+//---------------------------------------------------------------------------

+

+// Initialize all plug-ins except the web browser (which was initialized

+// early, before the login screen). JC

+void LLStartUp::multimediaInit()

+{

+	LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;

+	std::string msg = LLTrans::getString("LoginInitializingMultimedia");

+	set_startup_status(0.42f, msg.c_str(), gAgent.mMOTD.c_str());

+	display_startup();

+

+	// LLViewerMedia::initClass();

+	LLViewerParcelMedia::initClass();

+}

+

+void LLStartUp::fontInit()

+{

+	LL_DEBUGS("AppInit") << "Initializing fonts...." << LL_ENDL;

+	std::string msg = LLTrans::getString("LoginInitializingFonts");

+	set_startup_status(0.45f, msg.c_str(), gAgent.mMOTD.c_str());

+	display_startup();

+

+	LLFontGL::loadDefaultFonts();

+}

+

+void LLStartUp::initNameCache()

+{

+	// Can be called multiple times

+	if ( gCacheName ) return;

+

+	gCacheName = new LLCacheName(gMessageSystem);

+	gCacheName->addObserver(&callback_cache_name);

+	gCacheName->localizeCacheName("waiting", LLTrans::getString("AvatarNameWaiting"));

+	gCacheName->localizeCacheName("nobody", LLTrans::getString("AvatarNameNobody"));

+	gCacheName->localizeCacheName("none", LLTrans::getString("GroupNameNone"));

+	// Load stored cache if possible

+	LLAppViewer::instance()->loadNameCache();

+

+	// Start cache in not-running state until we figure out if we have

+	// capabilities for display name lookup

+	LLAvatarNameCache::initClass(false);

+	LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getBOOL("UseDisplayNames"));

+}

+

+void LLStartUp::cleanupNameCache()

+{

+	LLAvatarNameCache::cleanupClass();

+

+	delete gCacheName;

+	gCacheName = NULL;

+}

+

+bool LLStartUp::dispatchURL()

+{

+	// ok, if we've gotten this far and have a startup URL

+        if (!getStartSLURL().isValid())

+	{

+	  return false;

+	}

+        if(getStartSLURL().getType() != LLSLURL::APP)

+	  {

+	    

+		// If we started with a location, but we're already

+		// at that location, don't pop dialogs open.

+		LLVector3 pos = gAgent.getPositionAgent();

+		LLVector3 slurlpos = getStartSLURL().getPosition();

+		F32 dx = pos.mV[VX] - slurlpos.mV[VX];

+		F32 dy = pos.mV[VY] - slurlpos.mV[VY];

+		const F32 SLOP = 2.f;	// meters

+

+		if( getStartSLURL().getRegion() != gAgent.getRegion()->getName()

+			|| (dx*dx > SLOP*SLOP)

+			|| (dy*dy > SLOP*SLOP) )

+		{

+			LLURLDispatcher::dispatch(getStartSLURL().getSLURLString(), 

+						  NULL, false);

+		}

+		return true;

+	}

+	return false;

+}

+

+void LLStartUp::setStartSLURL(const LLSLURL& slurl) 

+{

+  sStartSLURL = slurl;

+  switch(slurl.getType())

+    {

+    case LLSLURL::HOME_LOCATION:

+      {

+		  gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_HOME);

+	break;

+      }

+    case LLSLURL::LAST_LOCATION:

+      {

+	gSavedSettings.setString("LoginLocation", LLSLURL::SIM_LOCATION_LAST);

+	break;

+      }

+    default:

+			LLGridManager::getInstance()->setGridChoice(slurl.getGrid());

+			break;

+    }

+}

+

+bool login_alert_done(const LLSD& notification, const LLSD& response)

+{

+	LLPanelLogin::giveFocus();

+	return false;

+}

+

+// parse the certificate information into args for the 

+// certificate notifications

+LLSD transform_cert_args(LLPointer<LLCertificate> cert)

+{

+	LLSD args = LLSD::emptyMap();

+	std::string value;

+	LLSD cert_info;

+	cert->getLLSD(cert_info);

+	// convert all of the elements in the cert into                                        

+	// args for the xml dialog, so we have flexability to                                  

+	// display various parts of the cert by only modifying                                 

+	// the cert alert dialog xml.                                                          

+	for(LLSD::map_iterator iter = cert_info.beginMap();

+		iter != cert_info.endMap();

+		iter++)

+	{

+		// key usage and extended key usage                                            

+		// are actually arrays, and we want to format them as comma separated          

+		// strings, so special case those.                                             

+		LLSDSerialize::toXML(cert_info[iter->first], std::cout);

+		if((iter->first== std::string(CERT_KEY_USAGE)) |

+		   (iter->first == std::string(CERT_EXTENDED_KEY_USAGE)))

+		{

+			value = "";

+			LLSD usage = cert_info[iter->first];

+			for (LLSD::array_iterator usage_iter = usage.beginArray();

+				 usage_iter != usage.endArray();

+				 usage_iter++)

+			{

+				

+				if(usage_iter != usage.beginArray())

+				{

+					value += ", ";

+				}

+				

+				value += (*usage_iter).asString();

+			}

+			

+		}

+		else

+		{

+			value = iter->second.asString();

+		}

+		

+		std::string name = iter->first;

+		std::transform(name.begin(), name.end(), name.begin(),

+					   (int(*)(int))toupper);

+		args[name.c_str()] = value;

+	}

+	return args;

+}

+

+

+// when we handle a cert error, give focus back to the login panel

+void general_cert_done(const LLSD& notification, const LLSD& response)

+{

+	LLStartUp::setStartupState( STATE_LOGIN_SHOW );			

+	LLPanelLogin::giveFocus();

+}

+

+// check to see if the user wants to trust the cert.

+// if they do, add it to the cert store and 

+void trust_cert_done(const LLSD& notification, const LLSD& response)

+{

+	S32 option = LLNotification::getSelectedOption(notification, response);	

+	switch(option)

+	{

+		case OPT_TRUST_CERT:

+		{

+			LLPointer<LLCertificate> cert = gSecAPIHandler->getCertificate(notification["payload"]["certificate"]);

+			LLPointer<LLCertificateStore> store = gSecAPIHandler->getCertificateStore(gSavedSettings.getString("CertStore"));			

+			store->add(cert);

+			store->save();

+			LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );	

+			break;

+		}

+		case OPT_CANCEL_TRUST:

+			reset_login();

+			gSavedSettings.setBOOL("AutoLogin", FALSE);			

+			LLStartUp::setStartupState( STATE_LOGIN_SHOW );				

+		default:

+			LLPanelLogin::giveFocus();

+			break;

+	}

+

+}

+

+void apply_udp_blacklist(const std::string& csv)

+{

+

+	std::string::size_type start = 0;

+	std::string::size_type comma = 0;

+	do 

+	{

+		comma = csv.find(",", start);

+		if (comma == std::string::npos)

+		{

+			comma = csv.length();

+		}

+		std::string item(csv, start, comma-start);

+

+		lldebugs << "udp_blacklist " << item << llendl;

+		gMessageSystem->banUdpMessage(item);

+		

+		start = comma + 1;

+

+	}

+	while(comma < csv.length());

+	

+}

+

+bool process_login_success_response()

+{

+	LLSD response = LLLoginInstance::getInstance()->getResponse();

+

+	std::string text(response["udp_blacklist"]);

+	if(!text.empty())

+	{

+		apply_udp_blacklist(text);

+	}

+

+	// unpack login data needed by the application

+	text = response["agent_id"].asString();

+	if(!text.empty()) gAgentID.set(text);

+	gDebugInfo["AgentID"] = text;

+	

+	// Agent id needed for parcel info request in LLUrlEntryParcel

+	// to resolve parcel name.

+	LLUrlEntryParcel::setAgentID(gAgentID);

+

+	text = response["session_id"].asString();

+	if(!text.empty()) gAgentSessionID.set(text);

+	gDebugInfo["SessionID"] = text;

+

+	// Session id needed for parcel info request in LLUrlEntryParcel

+	// to resolve parcel name.

+	LLUrlEntryParcel::setSessionID(gAgentSessionID);

+	

+	text = response["secure_session_id"].asString();

+	if(!text.empty()) gAgent.mSecureSessionID.set(text);

+

+	// if the response contains a display name, use that,

+	// otherwise if the response contains a first and/or last name,

+	// use those.  Otherwise use the credential identifier

+

+	gDisplayName = "";

+	if (response.has("display_name"))

+	{

+		gDisplayName.assign(response["display_name"].asString());

+		if(!gDisplayName.empty())

+		{

+			// Remove quotes from string.  Login.cgi sends these to force

+			// names that look like numbers into strings.

+			LLStringUtil::replaceChar(gDisplayName, '"', ' ');

+			LLStringUtil::trim(gDisplayName);

+		}

+	}

+	if(gDisplayName.empty())

+	{

+		if(response.has("first_name"))

+		{

+			gDisplayName.assign(response["first_name"].asString());

+			LLStringUtil::replaceChar(gDisplayName, '"', ' ');

+			LLStringUtil::trim(gDisplayName);

+		}

+		if(response.has("last_name"))

+		{

+			text.assign(response["last_name"].asString());

+			LLStringUtil::replaceChar(text, '"', ' ');

+			LLStringUtil::trim(text);

+			if(!gDisplayName.empty())

+			{

+				gDisplayName += " ";

+			}

+			gDisplayName += text;

+		}

+	}

+	if(gDisplayName.empty())

+	{

+		gDisplayName.assign(gUserCredential->asString());

+	}

+

+	// this is their actual ability to access content

+	text = response["agent_access_max"].asString();

+	if (!text.empty())

+	{

+		// agent_access can be 'A', 'M', and 'PG'.

+		gAgent.setMaturity(text[0]);

+	}

+	

+	// this is the value of their preference setting for that content

+	// which will always be <= agent_access_max

+	text = response["agent_region_access"].asString();

+	if (!text.empty())

+	{

+		U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]);

+

+		gSavedSettings.setU32("PreferredMaturity", preferredMaturity);

+	}

+	// During the AO transition, this flag will be true. Then the flag will

+	// go away. After the AO transition, this code and all the code that

+	// uses it can be deleted.

+	text = response["ao_transition"].asString();

+	if (!text.empty())

+	{

+		if (text == "1")

+		{

+			gAgent.setAOTransition();

+		}

+	}

+

+	text = response["start_location"].asString();

+	if(!text.empty()) 

+	{

+		gAgentStartLocation.assign(text);

+	}

+

+	text = response["circuit_code"].asString();

+	if(!text.empty())

+	{

+		gMessageSystem->mOurCircuitCode = strtoul(text.c_str(), NULL, 10);

+	}

+	std::string sim_ip_str = response["sim_ip"];

+	std::string sim_port_str = response["sim_port"];

+	if(!sim_ip_str.empty() && !sim_port_str.empty())

+	{

+		U32 sim_port = strtoul(sim_port_str.c_str(), NULL, 10);

+		gFirstSim.set(sim_ip_str, sim_port);

+		if (gFirstSim.isOk())

+		{

+			gMessageSystem->enableCircuit(gFirstSim, TRUE);

+		}

+	}

+	std::string region_x_str = response["region_x"];

+	std::string region_y_str = response["region_y"];

+	if(!region_x_str.empty() && !region_y_str.empty())

+	{

+		U32 region_x = strtoul(region_x_str.c_str(), NULL, 10);

+		U32 region_y = strtoul(region_y_str.c_str(), NULL, 10);

+		gFirstSimHandle = to_region_handle(region_x, region_y);

+	}

+	

+	const std::string look_at_str = response["look_at"];

+	if (!look_at_str.empty())

+	{

+		size_t len = look_at_str.size();

+		LLMemoryStream mstr((U8*)look_at_str.c_str(), len);

+		LLSD sd = LLSDSerialize::fromNotation(mstr, len);

+		gAgentStartLookAt = ll_vector3_from_sd(sd);

+	}

+

+	text = response["seed_capability"].asString();

+	if (!text.empty()) gFirstSimSeedCap = text;

+				

+	text = response["seconds_since_epoch"].asString();

+	if(!text.empty())

+	{

+		U32 server_utc_time = strtoul(text.c_str(), NULL, 10);

+		if(server_utc_time)

+		{

+			time_t now = time(NULL);

+			gUTCOffset = (server_utc_time - now);

+		}

+	}

+

+	// this is the base used to construct help URLs

+	text = response["help_url_format"].asString();

+	if (!text.empty())

+	{

+		// replace the default help URL format

+		gSavedSettings.setString("HelpURLFormat",text);

+		

+		// don't fall back to Standalone's pre-connection static help

+		gSavedSettings.setBOOL("HelpUseLocal", false);

+	}

+			

+	std::string home_location = response["home"];

+	if(!home_location.empty())

+	{

+		size_t len = home_location.size();

+		LLMemoryStream mstr((U8*)home_location.c_str(), len);

+		LLSD sd = LLSDSerialize::fromNotation(mstr, len);

+		S32 region_x = sd["region_handle"][0].asInteger();

+		S32 region_y = sd["region_handle"][1].asInteger();

+		U64 region_handle = to_region_handle(region_x, region_y);

+		LLVector3 position = ll_vector3_from_sd(sd["position"]);

+		gAgent.setHomePosRegion(region_handle, position);

+	}

+

+	gAgent.mMOTD.assign(response["message"]);

+

+	// Options...

+	// Each 'option' is an array of submaps. 

+	// It appears that we only ever use the first element of the array.

+	LLUUID inv_root_folder_id = response["inventory-root"][0]["folder_id"];

+	if(inv_root_folder_id.notNull())

+	{

+		gInventory.setRootFolderID(inv_root_folder_id);

+		//gInventory.mock(gAgent.getInventoryRootID());

+	}

+

+	LLSD login_flags = response["login-flags"][0];

+	if(login_flags.size())

+	{

+		std::string flag = login_flags["ever_logged_in"];

+		if(!flag.empty())

+		{

+			gAgent.setFirstLogin((flag == "N") ? TRUE : FALSE);

+		}

+

+		/*  Flag is currently ignored by the viewer.

+		flag = login_flags["stipend_since_login"];

+		if(flag == "Y") 

+		{

+			stipend_since_login = true;

+		}

+		*/

+

+		flag = login_flags["gendered"].asString();

+		if(flag == "Y")

+		{

+			gAgent.setGenderChosen(TRUE);

+		}

+		

+		bool pacific_daylight_time = false;

+		flag = login_flags["daylight_savings"].asString();

+		if(flag == "Y")

+		{

+			pacific_daylight_time = (flag == "Y");

+		}

+

+		//setup map of datetime strings to codes and slt & local time offset from utc

+		LLStringOps::setupDatetimeInfo(pacific_daylight_time);

+	}

+

+	// set up the voice configuration.  Ultimately, we should pass this up as part of each voice

+	// channel if we need to move to multiple voice servers per grid.

+	LLSD voice_config_info = response["voice-config"];

+	if(voice_config_info.has("VoiceServerType"))

+	{

+		gSavedSettings.setString("VoiceServerType", voice_config_info["VoiceServerType"].asString()); 

+	}

+

+	// Request the map server url

+	std::string map_server_url = response["map-server-url"];

+	if(!map_server_url.empty())

+	{

+		// We got an answer from the grid -> use that for map for the current session

+		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 

+		LL_INFOS("LLStartup") << "map-server-url : we got an answer from the grid : " << map_server_url << LL_ENDL;

+	}

+	else

+	{

+		// No answer from the grid -> use the default setting for current session 

+		map_server_url = gSavedSettings.getString("MapServerURL"); 

+		gSavedSettings.setString("CurrentMapServerURL", map_server_url); 

+		LL_INFOS("LLStartup") << "map-server-url : no map-server-url answer, we use the default setting for the map : " << map_server_url << LL_ENDL;

+	}

+	

+	// Default male and female avatars allowing the user to choose their avatar on first login.

+	// These may be passed up by SLE to allow choice of enterprise avatars instead of the standard

+	// "new ruth."  Not to be confused with 'initial-outfit' below 

+	LLSD newuser_config = response["newuser-config"][0];

+	if(newuser_config.has("DefaultFemaleAvatar"))

+	{

+		gSavedSettings.setString("DefaultFemaleAvatar", newuser_config["DefaultFemaleAvatar"].asString()); 		

+	}

+	if(newuser_config.has("DefaultMaleAvatar"))

+	{

+		gSavedSettings.setString("DefaultMaleAvatar", newuser_config["DefaultMaleAvatar"].asString()); 		

+	}

+	

+	// Initial outfit for the user.

+	// QUESTION: Why can't we simply simply set the users outfit directly

+	// from a web page into the user info on the server? - Roxie

+	LLSD initial_outfit = response["initial-outfit"][0];

+	if(initial_outfit.size())

+	{

+		std::string flag = initial_outfit["folder_name"];

+		if(!flag.empty())

+		{

+			// Initial outfit is a folder in your inventory,

+			// must be an exact folder-name match.

+			sInitialOutfit = flag;

+		}

+

+		flag = initial_outfit["gender"].asString();

+		if(!flag.empty())

+		{

+			sInitialOutfitGender = flag;

+		}

+	}

+

+	LLSD global_textures = response["global-textures"][0];

+	if(global_textures.size())

+	{

+		// Extract sun and moon texture IDs.  These are used

+		// in the LLVOSky constructor, but I can't figure out

+		// how to pass them in.  JC

+		LLUUID id = global_textures["sun_texture_id"];

+		if(id.notNull())

+		{

+			gSunTextureID = id;

+		}

+

+		id = global_textures["moon_texture_id"];

+		if(id.notNull())

+		{

+			gMoonTextureID = id;

+		}

+

+		id = global_textures["cloud_texture_id"];

+		if(id.notNull())

+		{

+			gCloudTextureID = id;

+		}

+	}

+

+	// Set the location of the snapshot sharing config endpoint

+	std::string snapshot_config_url = response["snapshot_config_url"];

+	if(!snapshot_config_url.empty())

+	{

+		gSavedSettings.setString("SnapshotConfigURL", snapshot_config_url);

+	}

+

+	// Start the process of fetching the OpenID session cookie for this user login

+	std::string openid_url = response["openid_url"];

+	if(!openid_url.empty())

+	{

+		std::string openid_token = response["openid_token"];

+		LLViewerMedia::openIDSetup(openid_url, openid_token);

+	}

+

+	if(response.has("max-agent-groups")) {		

+		std::string max_agent_groups(response["max-agent-groups"]);

+		gMaxAgentGroups = atoi(max_agent_groups.c_str());

+		LL_INFOS("LLStartup") << "gMaxAgentGroups read from login.cgi: "

+							  << gMaxAgentGroups << LL_ENDL;

+	}

+	else {

+		gMaxAgentGroups = DEFAULT_MAX_AGENT_GROUPS;

+		LL_INFOS("LLStartup") << "using gMaxAgentGroups default: "

+							  << gMaxAgentGroups << LL_ENDL;

+	}

+		

+	bool success = false;

+	// JC: gesture loading done below, when we have an asset system

+	// in place.  Don't delete/clear gUserCredentials until then.

+	if(gAgentID.notNull()

+	   && gAgentSessionID.notNull()

+	   && gMessageSystem->mOurCircuitCode

+	   && gFirstSim.isOk()

+	   && gInventory.getRootFolderID().notNull())

+	{

+		success = true;

+	}

+

+	return success;

+}

+

+void transition_back_to_login_panel(const std::string& emsg)

+{

+	if (gNoRender)

+	{

+		LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;

+		LL_WARNS("AppInit") << emsg << LL_ENDL;

+		exit(0);

+	}

+

+	// Bounce back to the login screen.

+	reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW );

+	gSavedSettings.setBOOL("AutoLogin", FALSE);

+}

diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index f54214b95c..7fb52c1939 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1419,22 +1419,21 @@ void LLTextureCache::readHeaderCache()
 					}
 				}
 			}
-			if (num_entries > sCacheMaxEntries)
+			if (num_entries - empty_entries > sCacheMaxEntries)
 			{
 				// Special case: cache size was reduced, need to remove entries
 				// Note: After we prune entries, we will call this again and create the LRU
-				U32 entries_to_purge = (num_entries-empty_entries) - sCacheMaxEntries;
+				U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
 				llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl;
-				if (entries_to_purge > 0)
+				// We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
+				// purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge
+				// So, it's certain that iter will never reach lru.end() first.
+				std::set<lru_data_t>::iterator iter = lru.begin();
+				while (purge_list.size() < entries_to_purge)
 				{
-					for (std::set<lru_data_t>::iterator iter = lru.begin(); iter != lru.end(); ++iter)
-					{
-						purge_list.insert(iter->second);
-						if (purge_list.size() >= entries_to_purge)
-							break;
-					}
+					purge_list.insert(iter->second);
+					++iter;
 				}
-				llassert_always(purge_list.size() >= entries_to_purge);
 			}
 			else
 			{
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 81479e8b49..979d91cfcb 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1180,6 +1180,7 @@ void LLViewerObjectList::clearAllMapObjectsInRegion(LLViewerRegion* regionp)
 	}
 }
 
+
 void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 {
 	LLColor4 above_water_color = LLUIColorTable::instance().getColor( "NetMapOtherOwnAboveWater" );
@@ -1199,7 +1200,6 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 	{
 		LLViewerObject* objectp = *iter;
 
-		//llassert_always(!objectp->isDead());
 		if(objectp->isDead())//some dead objects somehow not cleaned.
 		{
 			continue ;
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index da0375f732..483c9515db 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -803,7 +803,7 @@ class DarwinManifest(ViewerManifest):
                 self.run_command('SetFile -a V %r' % pathname)

 

             # Create the alias file (which is a resource file) from the .r

-            self.run_command('rez %r -o %r' %

+            self.run_command('Rez %r -o %r' %

                              (self.src_path_of("installers/darwin/release-dmg/Applications-alias.r"),

                               os.path.join(volpath, "Applications")))