1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 8882773..30e299a 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1791,8 +1791,13 @@ bool idle_startup()
                 regionp->setSeedCapability(first_sim_seed_cap);
                 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 region to be the one we just created
+                // Only if we don't already have one set. We want to catch this here
+                // because setRegion calls removeRegion, which kills the viewer -- MC
+                if (!gAgent.getRegion() && gAgent.getRegion() != regionp)
+                {
+                        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
@@ -2095,7 +2100,7 @@ bool idle_startup()
         if (STATE_AGENT_WAIT == LLStartUp::getStartupState())
         {
                 LL_DEBUGS("AppInitStartupState") << "STATE_AGENT_WAIT" << LL_ENDL;
-                if (connecting_region_timer.getElapsedTimeF32() > 15.0f)
+                if (connecting_region_timer.getElapsedTimeF32() > 10.0f)
                 {
                         // Bounce back to the login screen -- MC
                         LL_WARNS("AppInit") << "Bad login - can't connect to this region for some reason" << LL_ENDL;
@@ -3596,6 +3601,7 @@ 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 );
@@ -3606,6 +3612,7 @@ std::string LLStartUp::startupStateToString(EStartupState state)
                 RTNENUM( STATE_LOGIN_DOWNLOADING );
                 RTNENUM( STATE_LOGIN_PROCESS_RESPONSE );
                 RTNENUM( STATE_WORLD_INIT );
+                RTNENUM( STATE_MULTIMEDIA_INIT );
                 RTNENUM( STATE_SEED_GRANTED_WAIT );
                 RTNENUM( STATE_SEED_CAP_GRANTED );
                 RTNENUM( STATE_WORLD_WAIT );