2 files changed, 8 insertions, 17 deletions
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index b621f5ee92..e6877063b5 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -2100,7 +2100,7 @@ void LLWebRTCVoiceClient::tuningSetSpeakerVolume(float volume)
 				
 float LLWebRTCVoiceClient::tuningGetEnergy(void)
 {
-    return mWebRTCDeviceInterface->getTuningMicrophoneEnergy();
+    return mWebRTCDeviceInterface->getAudioLevel();
 }
 
 bool LLWebRTCVoiceClient::deviceSettingsAvailable()
@@ -2357,9 +2357,14 @@ void LLWebRTCVoiceClient::sendPositionAndVolumeUpdate(void)
         }
 	}
 
-	if (mWebRTCAudioInterface)
+    if (mWebRTCDataInterface && mWebRTCAudioInterface)
     {
-        mWebRTCAudioInterface->requestAudioLevel();
+        Json::FastWriter writer;
+        Json::Value      root;
+        root["p"]             = (uint32_t) ((F32)mWebRTCDeviceInterface->getAudioLevel() * 256);
+        std::string json_data = writer.write(root);
+
+        mWebRTCDataInterface->sendData(json_data, false);
     }
 	
 	
@@ -2613,19 +2618,6 @@ void LLWebRTCVoiceClient::OnAudioEstablished(llwebrtc::LLWebRTCAudioInterface *
     setVoiceControlStateUnless(VOICE_STATE_SESSION_ESTABLISHED, VOICE_STATE_SESSION_RETRY);
 }
 
-void LLWebRTCVoiceClient::OnAudioLevel(float level) 
-{
-    if (mWebRTCDataInterface)
-    {
-        Json::FastWriter writer;
-        Json::Value      root;
-        root["p"]     = (uint32_t) (level * 256);
-        std::string json_data = writer.write(root);
-
-        mWebRTCDataInterface->sendData(json_data, false);
-    }
-}
-
 void LLWebRTCVoiceClient::OnDataReceived(const std::string& data, bool binary)
 {
     // incoming data will be a json structure (if it's not binary.)  We may pack
diff --git a/indra/newview/llvoicewebrtc.h b/indra/newview/llvoicewebrtc.h
index bc858dcb32..518fee53ef 100644
--- a/indra/newview/llvoicewebrtc.h
+++ b/indra/newview/llvoicewebrtc.h
@@ -263,7 +263,6 @@ public:
     /// @name Signaling notification
     //  LLWebRTCAudioObserver
     //@{
-	void OnAudioLevel(float level) override;
     //@}
     
     /////////////////////////