summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2024-02-22 23:25:27 -0800
committerRoxie Linden <roxie@lindenlab.com>2024-02-22 23:25:27 -0800
commit4057d38e969b2a9d29d111ee3b238a562e82fd9a (patch)
tree693e2fa858e6f3b353bb506358d474e9b7efdbd0 /indra
parent1e5e3f130a2651d0217c6e20b8971f9f6677ab81 (diff)
coding cleanup
Diffstat (limited to 'indra')
-rw-r--r--indra/llwebrtc/CMakeLists.txt5
-rw-r--r--indra/llwebrtc/llwebrtc.cpp2
-rw-r--r--indra/llwebrtc/llwebrtc_impl.h2
3 files changed, 2 insertions, 7 deletions
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index f32d3dc580..29dc1df8d6 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -4,11 +4,6 @@
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-if (WINDOWS)
- set(CMAKE_GENERATOR_TOOLSET "CLangCL")
-endif (WINDOWS)
-
include(00-Common)
include(Linking)
include(WebRTC)
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 283124e315..adde174a74 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -40,7 +40,7 @@
namespace llwebrtc
{
-LLAudioDeviceObserver::LLAudioDeviceObserver() : mMicrophoneEnergy(0.0), mSumVector {0} {}
+LLAudioDeviceObserver::LLAudioDeviceObserver() : mSumVector {0}, mMicrophoneEnergy(0.0) {}
float LLAudioDeviceObserver::getMicrophoneEnergy() { return mMicrophoneEnergy; }
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index 7146267379..978d4f04e3 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -117,7 +117,7 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceS
{
public:
LLWebRTCImpl() :
- mPeerCustomProcessor(nullptr), mMute(true)
+ mMute(true), mPeerCustomProcessor(nullptr)
{
}
~LLWebRTCImpl() {}