some comments; allow proximal channel to retry when it drops

3 files changed, 11 insertions, 4 deletions

diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index 16afec061e..8bdd0334a9 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -40,8 +40,11 @@
 #include "llwebrtc.h"
 // WebRTC Includes
 #ifdef WEBRTC_WIN
-#pragma warning(disable : 4996)
-#pragma warning(disable : 4068)
+#pragma warning(disable : 4996) // ignore 'deprecated.'  We don't use the functions marked
+                                // deprecated in the webrtc headers, but msvc complains anyway.
+                                // Clang doesn't, and that's generally what webrtc uses.
+#pragma warning(disable : 4068) // ignore 'invalid pragma.'  There are clang pragma's in
+                                // the webrtc headers, which msvc doesn't recognize.
 #endif // WEBRTC_WIN
 
 #include "api/scoped_refptr.h"
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 921e757b58..215cc4103b 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -87,7 +87,10 @@ const S32 XL8_PADDING = 3;  // XL8_START_TAG.size() + XL8_END_TAG.size()
 /** Timeout of outgoing session initialization (in seconds) */
 const static U32 SESSION_INITIALIZATION_TIMEOUT = 30;
 
-
+// This enum corresponds to the sim's and adds P2P_CHAT_SESSION,
+// as webrtc uses the multiagent chat mechanism for p2p calls,
+// instead of relying on vivox calling. 
+// Don't change this without consulting a server developer.
 enum EMultiAgentChatSessionType
 {
     GROUP_CHAT_SESSION = 0,
diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp
index 28e895584b..5802cd0f1e 100644
--- a/indra/newview/llvoicechannel.cpp
+++ b/indra/newview/llvoicechannel.cpp
@@ -732,7 +732,7 @@ void LLVoiceChannelProximal::handleError(EStatusType status)
 		LLNotificationsUtil::add(notify, mNotifyArgs);
 	}
 
-	LLVoiceChannel::handleError(status);
+	// proximal voice remains up and the provider will try to reconnect.
 }
 
 void LLVoiceChannelProximal::deactivate()
@@ -741,6 +741,7 @@ void LLVoiceChannelProximal::deactivate()
 	{
 		setState(STATE_HUNG_UP);
 	}
+
 	LLVoiceClient::getInstance()->activateSpatialChannel(false);
 }