diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-01-25 17:29:57 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-01-25 17:29:57 +0200 |
| commit | 6e932911d5b0a02b44caf3bf81a9c00fd0e1dc89 (patch) | |
| tree | 710bbec0b2ae3743d501924747a868c19fdae952 | |
| parent | 2ea3fd95635073e68aa7626ea24c540717190127 (diff) | |
Related to normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve settings per resident between voice sessions)
- moved default internal voice level value into application settings
- cleanned up include list in llmutelist.cpp
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llmutelist.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoiceclient.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
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 @@ <key>Value</key> <integer>1</integer> </map> + <key>VoiceDefaultInternalLevel</key> + <map> + <key>Comment</key> + <string>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).</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>100</integer> + </map> <key>VoiceEarLocation</key> <map> <key>Comment</key> 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<S32> DEFAULT_INTERNAL_VOLUME_LEVEL("VoiceDefaultInternalLevel", 100); S32 ret_val = DEFAULT_INTERNAL_VOLUME_LEVEL; speaker_data_map_t::const_iterator it = mSpeakersData.find(speaker_id); |