diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c29a3a0035..72d2e1aba0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10314,6 +10314,17 @@ Value 1 + VoiceDefaultInternalLevel + + Comment + Internal level of voice set by default. Is equivalent to 0.5 (from 0.0-1.0 range) external voice level (internal = 400 * external^2). + Persist + 1 + Type + S32 + Value + 100 + VoiceEarLocation Comment diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 8e9fa97faf..c1666f5666 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -57,14 +57,10 @@ #include "llagent.h" #include "llviewergenericmessage.h" // for gGenericDispatcher -#include "llviewerwindow.h" #include "llworld.h" //for particle system banning -#include "llchat.h" #include "llimpanel.h" #include "llimview.h" #include "llnotifications.h" -#include "lluistring.h" -#include "llviewerobject.h" #include "llviewerobjectlist.h" #include "lltrans.h" diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 68b271d6cb..8ca0fd6ef6 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -1153,7 +1153,7 @@ void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, S32 vo S32 LLSpeakerVolumeStorage::getSpeakerVolume(const LLUUID& speaker_id) { // default internal level of user voice. - static const S32 DEFAULT_INTERNAL_VOLUME_LEVEL = 100; + const static LLUICachedControl DEFAULT_INTERNAL_VOLUME_LEVEL("VoiceDefaultInternalLevel", 100); S32 ret_val = DEFAULT_INTERNAL_VOLUME_LEVEL; speaker_data_map_t::const_iterator it = mSpeakersData.find(speaker_id);