livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-Added lost setting for typing sounds and renamed it to FSPlayTypingSound

meow-7.2.2
Ansariel 2011-08-05 20:54:06 +02:00
parent 7ea1345547
commit 92e8080753
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -14,6 +14,17 @@
<integer>1</integer>
</map>
<key>FSPlayTypingSound</key>
<map>
<key>Comment</key>
<string>Hear the typing sound when others type in to local chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSShowIMInChatHistory</key>
<map>
<key>Comment</key>

2
indra/newview/llvoavatar.cpp
View File

@ -4658,7 +4658,7 @@ BOOL LLVOAvatar::processSingleAnimationStateChange( const LLUUID& anim_id, BOOL
// gAudiop->triggerSound(LLUUID(gSavedSettings.getString("UISndTyping")), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
//}
//else
if(gSavedSettings.getBOOL("PhoenixPlayTypingSound"))
if(gSavedSettings.getBOOL("FSPlayTypingSound"))
{
LLUUID sound_id = LLUUID(gSavedSettings.getString("UISndTyping"));
gAudiop->triggerSound(sound_id, getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_SFX, char_pos_global);

2
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -134,7 +134,7 @@
name="play_avatar_animations"
width="400" />
<check_box
control_name="PhoenixPlayTypingSound"
control_name="FSPlayTypingSound"
follows="left|top"
height="16"
label="Hear typing sound when people type in local chat"