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

FIRE-20876: Add option to show Nearby Chat in console/toasts while bubble chat is enabled

meow-7.2.2
Ansariel 2017-02-12 11:01:36 +01:00
parent 74061d9a8d
commit 40ed5e9d2b
5 changed files with 29 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

@ -24319,6 +24319,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSBubblesHideConsoleAndToasts</key>
<map>
<key>Comment</key>
<string>If enabled, using bubble chat will hide the chat output in the Nearby Chat console and toasts</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

3
indra/newview/fsconsoleutils.cpp
View File

@ -43,6 +43,7 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
{
static LLCachedControl<bool> fsUseNearbyChatConsole(gSavedSettings, "FSUseNearbyChatConsole");
static LLCachedControl<bool> useChatBubbles(gSavedSettings, "UseChatBubbles");
static LLCachedControl<bool> fsBubblesHideConsoleAndToasts(gSavedSettings, "FSBubblesHideConsoleAndToasts");
if (!fsUseNearbyChatConsole)
{
@ -51,7 +52,7 @@ bool FSConsoleUtils::ProcessChatMessage(const LLChat& chat_msg, const LLSD &args
// Don't write to console if avatar chat and user wants
// bubble chat or if the user is busy.
if ( (chat_msg.mSourceType == CHAT_SOURCE_AGENT && useChatBubbles)
if ( (chat_msg.mSourceType == CHAT_SOURCE_AGENT && useChatBubbles && fsBubblesHideConsoleAndToasts)
|| gAgent.isDoNotDisturb() )
{
return true;

4
indra/newview/llfloaterimnearbychathandler.cpp
View File

@ -695,11 +695,13 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
// </FS:Ansariel>
static LLCachedControl<bool> useChatBubbles(gSavedSettings, "UseChatBubbles");
static LLCachedControl<bool> fsBubblesHideConsoleAndToasts(gSavedSettings, "FSBubblesHideConsoleAndToasts");
// <FS:Ansariel> [FS communication UI]
//if(( ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
// && useChatBubbles )
if( ( chat_msg.mSourceType == CHAT_SOURCE_AGENT
&& useChatBubbles && fsBubblesHideConsoleAndToasts )
// </FS:Ansariel> [FS communication UI]
&& useChatBubbles )
|| mChannel.isDead()
|| !mChannel.get()->getShowToasts() )
// <FS:Ansariel> [FS communication UI]

1
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View File

@ -21,6 +21,7 @@
<check_box name="FSMarkObjects" label="Objektename als (namenlos) anzeigen, um Vortäuschungen zu unterbinden"/>
<check_box label="llOwnerSay durch Skript-Debug-Fenster routen" name="FSllOwnerSayToScriptDebugWindow_checkbox"/>
<check_box label="Blasen-Chat" name="bubble_text_chat"/>
<check_box label="Chat in der Nähe in Konsole und Toasts nicht anzeigen" name="FSBubblesHideConsoleAndToasts"/>
<check_box label="Eingabe-Indikator in Blase oberhalb eines Avatars anzeigen" name="bubble_text_typing"/>
<check_box label="Eingabe-Indikator in Avatarnamen oberhalb eines Avatars anzeigen" name="FSShowTypingStateInNameTag"/>
<check_box label="Sekunden in Zeitstempel anzeigen [HH:MM:SS]" name="FSSecondsinChatTimestamps"/>

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

@ -155,12 +155,24 @@
top_pad="1"
name="bubble_text_chat"
width="150" />
<check_box
control_name="FSBubblesHideConsoleAndToasts"
enabled_control="UseChatBubbles"
follows="left|top"
height="16"
label="Don't show chat in Nearby Chat console and toasts"
layout="topleft"
left="30"
top_pad="1"
name="FSBubblesHideConsoleAndToasts"
width="150" />
<check_box
control_name="UseTypingBubbles"
follows="left|top"
height="16"
label="Show typing indicator in bubbles above avatars"
layout="topleft"
left="20"
top_pad="1"
name="bubble_text_typing"
width="150" />