Merge giab-viewer-trunk 2497, general merge of more

secapi stuff as well as certificate handling stuff.
Grid manager as well

1 files changed, 3 insertions, 10 deletions

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 423c46e14c..fc264a6fcf 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1327,18 +1327,11 @@ void LLVoiceClient::connectorShutdown()
 	}
 }
 
-void LLVoiceClient::userAuthorized(const std::string& firstName, const std::string& lastName, const LLUUID &agentID)
+void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &agentID)
 {
-	mAccountFirstName = firstName;
-	mAccountLastName = lastName;
+	LL_INFOS("Voice") << "name \"" << user_id << "\" , ID " << agentID << LL_ENDL;
 
-	mAccountDisplayName = firstName;
-	mAccountDisplayName += " ";
-	mAccountDisplayName += lastName;
-
-	LL_INFOS("Voice") << "name \"" << mAccountDisplayName << "\" , ID " << agentID << LL_ENDL;
-
-	sConnectingToAgni = LLViewerLogin::getInstance()->isInProductionGrid();
+	sConnectingToAgni = LLGridManager::getInstance()->isInProductionGrid();
 
 	mAccountName = nameFromID(agentID);
 }