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
meow-7.2.2
Mike Antipov 2010-01-25 17:29:57 +02:00
parent 2ea3fd9563
commit 6e932911d5
3 changed files with 12 additions and 5 deletions

View File

@ -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>

View File

@ -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"

View File

@ -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);