1 files changed, 11 insertions, 9 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 89c944d..428596b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -191,7 +191,7 @@
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
 #include "llsocks5.h"
-#include "viewerversion.h"
+#include "viewerinfo.h"
 
 #include "lgghunspell_wrapper.h"
 #include "jcfloater_animation_list.h"
@@ -539,9 +539,9 @@ bool idle_startup()
                         if(!start_messaging_system(
                                    message_template_path,
                                    port,
-                                   ViewerVersion::getLLMajorVersion(),
-                                   ViewerVersion::getLLMinorVersion(),
-                                   ViewerVersion::getLLPatchVersion(),
+                                   ViewerInfo::versionMajor(),
+                                   ViewerInfo::versionMinor(),
+                                   ViewerInfo::versionPatch(),
                                    FALSE,
                                    std::string(),
                                    responder,
@@ -1891,8 +1891,7 @@ bool idle_startup()
                         tmp = LLUserAuth::getInstance()->getResponse("max-agent-groups");
                         if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setMaxAgentGroups(atoi(tmp.c_str()));
 
-                        tmp = LLUserAuth::getInstance()->getResponse("VoiceConnector");
-                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setVoiceConnector(tmp);
+
                         gHippoGridManager->saveFile();
                         gHippoLimits->setLimits();
 
@@ -1938,8 +1937,7 @@ bool idle_startup()
                         }
                         // else llwarns << "MapServerURL empty"<< llendl;
 
-                        // Pass the user information to the voice chat server interface.
-                        gVoiceClient->userAuthorized(firstname, lastname, gAgentID);
+
                 }
                 else // if(successful_login)
                 {
@@ -2072,6 +2070,7 @@ bool idle_startup()
                 LL_DEBUGS("AppInitStartupState") << "STATE_SEED_CAP_GRANTED" << LL_ENDL;
                 update_texture_fetch();
 
+
                 if ( gViewerWindow != NULL)
                 {       // This isn't the first logon attempt, so show the UI
                         gViewerWindow->setNormalControlsVisible( TRUE );
@@ -2130,6 +2129,9 @@ bool idle_startup()
                 //
                 LL_INFOS("AppInit") << "Initializing communications..." << LL_ENDL;
 
+                // Pass the user information to the voice chat server interface.
+                gVoiceClient->userAuthorized(firstname, lastname, gAgentID);
+
                 // register callbacks for messages. . . do this after initial handshake to make sure that we don't catch any unwanted
                 register_viewer_callbacks(gMessageSystem);
 
@@ -2149,7 +2151,7 @@ bool idle_startup()
                         gCacheName->addObserver(callback_cache_name);
         
                         // Load stored cache if possible
-            LLAppViewer::instance()->loadNameCache();
+                        LLAppViewer::instance()->loadNameCache();
 
                         // Start cache in not-running state until we figure out if we have
                         // capabilities for display name lookup