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

merge changes for storm-1931

meow-7.2.2
Oz Linden 2013-03-25 15:37:45 -04:00
parent 1057caffaf cfaadff2fb
commit 76f8d755b0
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

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

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

@ -6867,6 +6867,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>

2
indra/newview/llchatbar.cpp
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"));
}
}
}

2
indra/newview/llfloaterimnearbychat.cpp
View File

@ -577,7 +577,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"));
}
}

4
indra/newview/llfloaterimnearbychatlistener.cpp
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"));
}