FIRE-20385: Add option to show/hide invitations to already joined groups

Fri, 01 Dec 2017 20:22:12 +0100

author
Ansariel
date
Fri, 01 Dec 2017 20:22:12 +0100
changeset 53528
a62cfa41efa7
parent 53527
8f3077e4d580
child 53529
14e56e1c099a

FIRE-20385: Add option to show/hide invitations to already joined groups

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llviewermessage.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_preferences_privacy.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Fri Dec 01 20:08:02 2017 +0100
     1.2 +++ b/indra/newview/app_settings/settings.xml	Fri Dec 01 20:22:12 2017 +0100
     1.3 @@ -24489,6 +24489,17 @@
     1.4        <key>Value</key>
     1.5        <integer>0</integer>
     1.6      </map>
     1.7 +    <key>FSShowJoinedGroupInvitations</key>
     1.8 +    <map>
     1.9 +      <key>Comment</key>
    1.10 +      <string>If enabled, invitations to groups you are already a member in will be shown</string>
    1.11 +      <key>Persist</key>
    1.12 +      <integer>1</integer>
    1.13 +      <key>Type</key>
    1.14 +      <string>Boolean</string>
    1.15 +      <key>Value</key>
    1.16 +      <integer>0</integer>
    1.17 +    </map>
    1.18    </map>
    1.19  </llsd>
    1.20  
     2.1 --- a/indra/newview/llviewermessage.cpp	Fri Dec 01 20:08:02 2017 +0100
     2.2 +++ b/indra/newview/llviewermessage.cpp	Fri Dec 01 20:22:12 2017 +0100
     2.3 @@ -3458,7 +3458,7 @@
     2.4  	case IM_GROUP_INVITATION:
     2.5  		{
     2.6  			// <FS:Ansariel> FIRE-20385: Don't show group invitation for groups agent is already a member of
     2.7 -			if (gAgent.isInGroup(from_id))
     2.8 +			if (gAgent.isInGroup(from_id) && !gSavedSettings.getBOOL("FSShowJoinedGroupInvitations"))
     2.9  			{
    2.10  				LL_INFOS("Messaging") << "Received group invitation for group " << from_id << " but we are already a member" << LL_ENDL;
    2.11  				return;
     3.1 --- a/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml	Fri Dec 01 20:08:02 2017 +0100
     3.2 +++ b/indra/newview/skins/default/xui/de/panel_preferences_privacy.xml	Fri Dec 01 20:22:12 2017 +0100
     3.3 @@ -22,6 +22,7 @@
     3.4  			<check_box label="Zeige meine Profilinformationen in den Suchergebnissen" name="online_searchresults"/>
     3.5  			<check_box label="Nur Freunde und Gruppen wissen, dass ich online bin" name="online_visibility"/>
     3.6  			<check_box label="Nur Freunde und Gruppen können mich anrufen oder mir eine IM schicken" name="voice_call_friends_only_check"/>
     3.7 +			<check_box label="Einladungen für bereits beigetretene Gruppen anzeigen" name="FSShowJoinedGroupInvitations"/>
     3.8  			<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>
     3.9  			<check_box label="Objekten erlauben, die aktuelle Spracheinstellung abzufragen" name="LanguageIsPublic"/>
    3.10  			<check_box label="Automatisches Akzeptieren von Inventar-Angeboten" name="Auto_Accept_New_Inventory"/>
     4.1 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml	Fri Dec 01 20:08:02 2017 +0100
     4.2 +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml	Fri Dec 01 20:22:12 2017 +0100
     4.3 @@ -102,6 +102,14 @@
     4.4      top_pad="3"
     4.5      width="350" />
     4.6     <check_box
     4.7 +    control_name="FSShowJoinedGroupInvitations"
     4.8 +    height="16"
     4.9 +    label="Show invitations for already joined groups"
    4.10 +    layout="topleft"
    4.11 +    name="FSShowJoinedGroupInvitations"
    4.12 +    top_pad="3"
    4.13 +    width="350" />
    4.14 +   <check_box
    4.15      enabled_control="EnableVoiceChat"
    4.16      control_name="AutoDisengageMic"
    4.17      height="16"

mercurial