Merge pull request #5824 from secondlife/cosmic/janus_set_version

(develop) Fix display of ad-hoc session type in About and display p2p instead as appropriate

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 333046adce..6d5a8eae6a 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -353,9 +353,16 @@ void LLWebRTCVoiceClient::updateVersion()
     {
         // A WebRTC session can be connected to multiple servers at once. To more easily disambiguate which server version is being printed, show the connection type. In most cases, this shouldn't matter and the Janus version should be the same for all connections. Janus versions are also logged for each connection.
         mVoiceVersion.serverVersion = session->getVersion();
-        if (session->isCallbackPossible())
+        if (dynamic_cast<adhocSessionState*>(session.get()))
         {
-            mVoiceVersion.mBuildVersion = "ad-hoc";
+            if (session->mHangupOnLastLeave)
+            {
+                mVoiceVersion.mBuildVersion = "p2p";
+            }
+            else
+            {
+                mVoiceVersion.mBuildVersion = "ad-hoc";
+            }
         }
         else if (session->isEstate())
         {