diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-03-20 21:41:26 +0000 |
commit | e3b97ac65b10a58c1dac041743e4acd1042492f5 (patch) | |
tree | 1648189fd15e51ac1c2eb8d8018faa775c93f6d3 /indra/newview/llvieweraudio.cpp | |
parent | b502c86f30d3ed01b795548364ab8090363eeac5 (diff) |
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
Diffstat (limited to 'indra/newview/llvieweraudio.cpp')
-rw-r--r-- | indra/newview/llvieweraudio.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index affce91b79..fd85ac1bc1 100644 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -65,7 +65,7 @@ void init_audio() BOOL mute_audio = gSavedSettings.getBOOL("MuteAudio"); - if (!mute_audio && gPreloadSounds) + if (!mute_audio && FALSE == gSavedSettings.getBOOL("NoPreload")) { gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert"))); gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke"))); |