STORM-1931: Added option to disable chat animations (say/whisper/shout)

meow-7.2.2
Ansariel 2013-02-22 11:19:51 +01:00
parent f79f9f111b
commit 2474385a2a
6 changed files with 32 additions and 8 deletions

View File

@ -175,6 +175,7 @@ Ansariel Hiller
STORM-1685
STORM-1713
STORM-1899
STORM-1931
Aralara Rajal
Ardy Lay
STORM-859

View File

@ -6845,6 +6845,17 @@
<key>Value</key>
<real>90.0</real>
</map>
<key>PlayChatAnim</key>
<map>
<key>Comment</key>
<string>Your avatar plays the chat animation whenever you say, shout or whisper something in nearby chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PlayTypingAnim</key>
<map>
<key>Comment</key>

View File

@ -381,7 +381,7 @@ void LLChatBar::sendChat( EChatType type )
if (!utf8_revised_text.empty())
{
// Chat with animation
sendChatFromViewer(utf8_revised_text, type, TRUE);
sendChatFromViewer(utf8_revised_text, type, gSavedSettings.getBOOL("PlayChatAnim"));
}
}
}

View File

@ -511,7 +511,7 @@ void LLFloaterIMNearbyChat::sendChat( EChatType type )
if (!utf8_revised_text.empty())
{
// Chat with animation
sendChatFromViewer(utf8_revised_text, type, TRUE);
sendChatFromViewer(utf8_revised_text, type, gSavedSettings.getBOOL("PlayChatAnim"));
}
}

View File

@ -33,7 +33,7 @@
#include "llagent.h"
#include "llchat.h"
#include "llviewercontrol.h"
LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener(LLFloaterIMNearbyChat & chatbar)
@ -95,6 +95,6 @@ void LLFloaterIMNearbyChatListener::sendChat(LLSD const & chat_data) const
}
// Send it as if it was typed in
mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, ((BOOL)(channel == 0)) && gSavedSettings.getBOOL("PlayChatAnim"));
}

View File

@ -29,13 +29,24 @@
width="330">
</check_box>
<check_box
control_name="PlayChatAnim"
height="16"
initial_value="true"
label="Play chat animations when chatting in nearby chat"
layout="topleft"
top_pad="2"
name="play_chat_animation"
width="330">
</check_box>
<check_box
enabled="false"
height="16"
label="Email me IMs when I'm offline"
layout="topleft"
name="send_im_to_email"
top_pad="6"
top_pad="2"
width="330">
</check_box>
@ -45,7 +56,7 @@
label="Only friends and groups can call or IM me"
layout="topleft"
name="voice_call_friends_only_check"
top_pad="6"
top_pad="2"
width="350">
</check_box>
@ -98,6 +109,7 @@
height="165"
layout="topleft"
left="13"
top_pad="12"
width="517">
<text
@ -284,7 +296,7 @@
height="13"
name="notifications_alert"
width="500"
top_pad="9"
top_pad="7"
visible="true"
text_color="DrYellow">
To temporarily stop all notifications, use Communicate &gt; Do Not Disturb.
@ -297,7 +309,7 @@
height="50"
layout="topleft"
left="13"
top_pad="10"
top_pad="7"
width="517">
<text