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

FIRE-10940: Added option to suppress group notice text in group chat 

Also, exposing Kadah's FSBetterGroupNoticesToIMLog in Prefs
Northspring 2014-01-16 22:48:36 +01:00
parent 01d2902357
commit 19ac039501
4 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21213,6 +21213,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSGroupNoticesToIMLog</key>
<map>
<key>Comment</key>
<string>Show group notices in group chats, in addition to toasts.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSBetterGroupNoticesToIMLog</key>
<map>
<key>Comment</key>

7
indra/newview/llnotificationhandlerutil.cpp
View File

@ -212,6 +212,13 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
return;
}
// <FS:PP> FIRE-10940: Add option to suppress group notice text in group chat
if (!gSavedSettings.getBOOL("FSGroupNoticesToIMLog"))
{
return;
}
// </FS:PP>
const std::string group_name = groupData.mName;
const std::string sender_name = payload["sender_name"].asString();

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

@ -714,6 +714,28 @@
value="0"/>
</combo_box>
<check_box
layout="topleft"
follows="left|top"
top_pad="10"
left="30"
width="400"
height="18"
name="FSGroupNoticesToIMLog"
control_name="FSGroupNoticesToIMLog"
label="Show group notices in group chats, in addition to toasts"/>
<check_box
enabled_control="FSGroupNoticesToIMLog"
layout="topleft"
follows="left|top"
top_pad="1"
left_delta="10"
width="400"
height="18"
name="FSBetterGroupNoticesToIMLog"
control_name="FSBetterGroupNoticesToIMLog"
label="Show their subjects and authors as well"/>
</panel>
<!-- Chat: Firestorm -->

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

@ -114,6 +114,8 @@
<combo_box.item label="Odtwarzaj dźwięk tylko gdy okno jest nieaktywne w tle" name="3"/>
<combo_box.item label="Nie odtwarzaj żadnego dźwięku powiadomienia" name="0"/>
</combo_box>
<check_box name="FSGroupNoticesToIMLog" label="Pokazuj ogłoszenia grup także w czatach grupowych, a nie tylko w tostach"/>
<check_box name="FSBetterGroupNoticesToIMLog" label="Pokazuj również ich tematy i autorów"/>
</panel>
<panel name="ChatFirestorm">
<text name="chat_and_im_enhancements">