1 files changed, 6 insertions, 3 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 3f02f6a..2623b05 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -568,7 +568,10 @@ BOOL idle_startup()
 #endif // LL_LINUX
 
                 std::ostringstream codec;
-                codec << "[Second Life " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD << "]";
+                codec << "[Second Life ";
+                codec << "(" << gChannelName << ")";
+                codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
+                codec << "]";
                 LLMozLib::getInstance()->setBrowserAgentId( codec.str() );
                 #endif
 
@@ -2633,7 +2636,7 @@ void update_dialog_callback(S32 option, void *userdata)
 #if !LL_RELEASE_FOR_DOWNLOAD
         if (option == 2)
         {
-                LLStartUp::setStartupState( STATE_WORLD_INIT ); 
+                LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); 
                 return;
         }
 #endif
@@ -2649,7 +2652,7 @@ void update_dialog_callback(S32 option, void *userdata)
                 }
                 else
                 {
-                        LLStartUp::setStartupState( STATE_WORLD_INIT );
+                        LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
                 }
                 return;
         }