MAINT-6224 Notifications Update "When I spend or get L$" split into two options.

3 files changed, 45 insertions, 7 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0ac2dcc86c..aef2438dc7 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6993,6 +6993,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>NotifyMoneySpend</key>
+    <map>
+      <key>Comment</key>
+      <string>Pop up notifications when spending L$</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>NotifyMoneyReceived</key>
+    <map>
+      <key>Comment</key>
+      <string>Pop up notifications when receiving L$</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>NotifyTipDuration</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 05e00ea987..810cf60f81 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5637,6 +5637,10 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 	bool you_paid_someone = (source_id == gAgentID);
 	if (you_paid_someone)
 	{
+		if(!gSavedSettings.getBOOL("NotifyMoneySpend"))
+		{
+			return;
+		}
 		args["NAME"] = dest_slurl;
 		is_name_group = is_dest_group;
 		name_id = dest_id;
@@ -5674,6 +5678,10 @@ static void process_money_balance_reply_extended(LLMessageSystem* msg)
 	}
 	else {
 		// ...someone paid you
+		if(!gSavedSettings.getBOOL("NotifyMoneyReceived"))
+		{
+			return;
+		}
 		args["NAME"] = source_slurl;
 		is_name_group = is_source_group;
 		name_id = source_id;
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 714dca7fac..93c97ded25 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -21,12 +21,12 @@
         Tell me:
     </text>
     <check_box
-     control_name="NotifyMoneyChange"
+     control_name="NotifyMoneySpend"
      height="16"
-     label="When I spend or get L$"
+     label="When I spend L$"
      layout="topleft"
      left_delta="50"
-     name="notify_money_change_checkbox"
+     name="notify_money_spend_checkbox"
      top_pad="4"
      width="300" />
     <check_box
@@ -34,10 +34,18 @@
      height="16"
      label="When my friends log in or out"
      layout="topleft"
-     left_delta="0"
-     name="friends_online_notify_checkbox"
-     top_pad="4"
-     width="300" />
+     left_delta="150"
+     name="friends_online_notify_checkbox"     
+     width="300" />	
+    <check_box
+     control_name="NotifyMoneyReceived"
+     height="16"
+     label="When I get L$"
+     layout="topleft"
+     left_delta="-150"
+     top_pad="4"	
+     name="notify_money_received_checkbox"     
+     width="300" />   
     <text
      type="string"
      length="1"