Adjust logic for determine what voice server type to use.

2 files changed, 10 insertions, 26 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index b590c462fa..efa8bd2109 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -424,17 +424,6 @@ void startConferenceCoro(std::string url,
     postData["method"] = "start conference";
     postData["session-id"] = tempSessionId;
     postData["params"] = agents;
-    LLSD altParams;
-    std::string voice_server_type = gSavedSettings.getString("VoiceServerType");
-    if (voice_server_type.empty())
-    {
-        // default to the server type associated with the region we're on.
-        LLVoiceVersionInfo versionInfo = LLVoiceClient::getInstance()->getVersion();
-        voice_server_type              = versionInfo.internalVoiceServerType;
-    }
-    altParams["voice_server_type"] = voice_server_type;
-    postData["alt_params"]         = altParams;
-
     LLSD result = httpAdapter->postAndSuspend(httpRequest, url, postData);
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
@@ -473,17 +462,6 @@ void startP2PVoiceCoro(std::string url, LLUUID sessionID, LLUUID creatorId, LLUU
     postData["method"]     = "start p2p voice";
     postData["session-id"] = sessionID;
     postData["params"]     = otherParticipantId;
-    LLSD altParams;
-    std::string voice_server_type = gSavedSettings.getString("VoiceServerType");
-    if (voice_server_type.empty())
-    {
-        // default to the server type associated with the region we're on.
-        LLVoiceVersionInfo versionInfo = LLVoiceClient::getInstance()->getVersion();
-        voice_server_type              = versionInfo.internalVoiceServerType;
-    }
-    altParams["voice_server_type"] = voice_server_type;
-    postData["alt_params"]         = altParams;
-
     LLSD result = httpAdapter->postAndSuspend(httpRequest, url, postData);
 
     LLSD               httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
@@ -2133,7 +2111,7 @@ bool LLIMModel::sendStartSession(
 		//we also need to wait for reply from the server in case of ad-hoc chat (we'll get new session id)
 		return true;
 	}
-	else if ((dialog == IM_SESSION_P2P_INVITE) || (dialog == IM_NOTHING_SPECIAL))
+	else if (p2p_as_adhoc_call && ((dialog == IM_SESSION_P2P_INVITE) || (dialog == IM_NOTHING_SPECIAL)))
 	{
 		LLViewerRegion *region = gAgent.getRegion();
 		if (region)
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 9dbf469ca8..6eadc3892e 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -538,12 +538,18 @@ LLVoiceP2PIncomingCallInterfacePtr LLVoiceClient::getIncomingCallInterface(const
 // outgoing calls
 LLVoiceP2POutgoingCallInterface *LLVoiceClient::getOutgoingCallInterface(const LLSD& voiceChannelInfo)
 {
-    std::string voiceServerType = gSavedSettings.getString("VoiceServerType");
+    std::string voice_server_type = gSavedSettings.getString("VoiceServerType");
+    if (voice_server_type.empty())
+    {
+        // default to the server type associated with the region we're on.
+        LLVoiceVersionInfo versionInfo = LLVoiceClient::getInstance()->getVersion();
+        voice_server_type = versionInfo.internalVoiceServerType;
+    }
     if (voiceChannelInfo.has("voice_server_type"))
     {
-        voiceServerType = voiceChannelInfo["voice_server_type"].asString();
+        voice_server_type = voiceChannelInfo["voice_server_type"].asString();
     }
-    LLVoiceModuleInterface *module = getVoiceModule(voiceServerType);
+    LLVoiceModuleInterface *module = getVoiceModule(voice_server_type);
     return dynamic_cast<LLVoiceP2POutgoingCallInterface *>(module);
 }