CR suggestions

3 files changed, 30 insertions, 44 deletions

diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 57130bb734..eb9bb65e67 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -515,16 +515,6 @@ void LLWebRTCImpl::updateDevices()
         char name[webrtc::kAdmMaxDeviceNameSize];
         char guid[webrtc::kAdmMaxGuidSize];
         mTuningDeviceModule->PlayoutDeviceName(index, name, guid);
-
-#if WEBRTC_LINUX
-        // Linux audio implementation (pulse and alsa)
-        // return empty strings for the guid, so 
-        // use the name for the guid
-        if (!strcmp(guid, ""))
-        {
-            strcpy(guid, name);
-        }
-#endif // WEBRTC_LINUX
         mPlayoutDeviceList.emplace_back(name, guid);
     }
 
@@ -543,15 +533,6 @@ void LLWebRTCImpl::updateDevices()
         char name[webrtc::kAdmMaxDeviceNameSize];
         char guid[webrtc::kAdmMaxGuidSize];
         mTuningDeviceModule->RecordingDeviceName(index, name, guid);
-#if WEBRTC_LINUX
-        // Linux audio implementation (pulse and alsa)
-        // return empty strings for the guid, so
-        // use the name for the guid
-        if (!strcmp(guid, ""))
-        {
-            strcpy(guid, name);
-        }
-#endif  // WEBRTC_LINUX
         mRecordingDeviceList.emplace_back(name, guid);
     }
 
diff --git a/indra/llwebrtc/llwebrtc.h b/indra/llwebrtc/llwebrtc.h
index 8830799cde..ac71e0c744 100644
--- a/indra/llwebrtc/llwebrtc.h
+++ b/indra/llwebrtc/llwebrtc.h
@@ -78,7 +78,12 @@ class LLWebRTCVoiceDevice
     LLWebRTCVoiceDevice(const std::string &display_name, const std::string &id) :
         mDisplayName(display_name),
         mID(id)
-    {};
+    {
+        if (mID.empty())
+        {
+            mID = display_name;
+        }
+    };
 };
 
 typedef std::vector<LLWebRTCVoiceDevice> LLWebRTCVoiceDeviceList;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index f01fde08d9..9c8fcd3283 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -3005,42 +3005,42 @@ void LLIncomingCallDialog::processCallResponse(S32 response, const LLSD &payload
 	{
 		if (type == IM_SESSION_P2P_INVITE)
 		{
-            // decline p2p voice, either via the vivox-style call mechanism
+			// decline p2p voice, either via the vivox-style call mechanism
 			// or via the webrtc-style "decline p2p" mechanism.
-            LLVoiceP2PIncomingCallInterfacePtr call = LLVoiceClient::getInstance()->getIncomingCallInterface(payload["voice_channel_info"]);
-            if (call)
-            {
-                call->declineInvite();
-            }
+			LLVoiceP2PIncomingCallInterfacePtr call = LLVoiceClient::getInstance()->getIncomingCallInterface(payload["voice_channel_info"]);
+			if (call)
+			{
+				call->declineInvite();
+			}
 			else
 			{
 				// webrtc-style decline.
-                LLViewerRegion *region = gAgent.getRegion();
-                if (region)
-                {
-                    std::string url = region->getCapability("ChatSessionRequest");
+				LLViewerRegion *region = gAgent.getRegion();
+				if (region)
+				{
+					std::string url = region->getCapability("ChatSessionRequest");
 
-                    LLSD data;
-                    data["method"]     = "decline p2p voice";
-                    data["session-id"] = session_id;
+					LLSD data;
+					data["method"]     = "decline p2p voice";
+					data["session-id"] = session_id;
 
-                    LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "P2P declined", "P2P decline failed.");
-                }
+					LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "P2P declined", "P2P decline failed.");
+				}
 			}
 		}
 		else
 		{
-            LLViewerRegion *region = gAgent.getRegion();
-            if (region)
-            {
-                std::string url = region->getCapability("ChatSessionRequest");
+			LLViewerRegion *region = gAgent.getRegion();
+			if (region)
+			{
+				std::string url = region->getCapability("ChatSessionRequest");
 
-                LLSD data;
-                data["method"]     = "decline invitation";
-                data["session-id"] = session_id;
+				LLSD data;
+				data["method"]     = "decline invitation";
+				data["session-id"] = session_id;
 
-                LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "Invitation declined", "Invitation decline failed.");
-            }
+				LLCoreHttpUtil::HttpCoroutineAdapter::messageHttpPost(url, data, "Invitation declined", "Invitation decline failed.");
+			}
 		}
 	}