From fa6af6185e960a4d6def3ff900e546e7a3bf215f Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Fri, 14 Jun 2013 19:48:40 -0600
Subject: [PATCH] FIRE-10628: Option to not toast the upload payment
 notifications. Remove orphaned DebugShowUploadCost

---
 indra/newview/app_settings/settings.xml       | 22 +++++++++----------
 indra/newview/fsfloaterimport.cpp             | 11 +++++++---
 indra/newview/llassetuploadresponders.cpp     | 13 +++++++----
 .../skins/default/xui/en/menu_viewer.xml      |  8 +++----
 .../xui/en/panel_preferences_alerts.xml       | 11 +++++++++-
 5 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0ae158392d..6983d4593e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3879,17 +3879,6 @@
       <key>Backup</key>
       <integer>0</integer>
     </map>
-  <key>DebugShowUploadCost</key>
-  <map>
-    <key>Comment</key>
-    <string>Show mesh upload cost</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>DebugShowXUINames</key>
     <map>
       <key>Comment</key>
@@ -20478,5 +20467,16 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>FSShowUploadPaymentToast</key>
+    <map>
+      <key>Comment</key>
+      <string>Show UploadPayment Notifications</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp
index 1f6e8b97dd..8e933c349b 100644
--- a/indra/newview/fsfloaterimport.cpp
+++ b/indra/newview/fsfloaterimport.cpp
@@ -1835,9 +1835,14 @@ void FSAssetResponder::uploadComplete(const LLSD& content)
 				// and display something saying that it cost L$
 				LLStatusBar::sendMoneyBalanceRequest();
 
-				LLSD args;
-				args["AMOUNT"] = llformat("%d", upload_price);
-				LLNotificationsUtil::add("UploadPayment", args);
+				// <FS:CR> FIRE-10628 - Option to supress upload cost notification
+				if (gSavedSettings.getBOOL("FSShowUploadPaymentToast"))
+				{
+					LLSD args;
+					args["AMOUNT"] = llformat("%d", upload_price);
+					LLNotificationsUtil::add("UploadPayment", args);
+				}
+				// </FS:CR>
 			}
 
 			if( item_folder_id.notNull() )
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 59a7f6b2b0..658dcfd90c 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -89,10 +89,15 @@ void on_new_single_inventory_upload_complete(
 		// this upload costed us L$, update our balance
 		// and display something saying that it cost L$
 		LLStatusBar::sendMoneyBalanceRequest();
-
-		LLSD args;
-		args["AMOUNT"] = llformat("%d", upload_price);
-		LLNotificationsUtil::add("UploadPayment", args);
+		
+		// <FS:CR> FIRE-10628 - Option to supress upload cost notification
+		if (gSavedSettings.getBOOL("FSShowUploadPaymentToast"))
+		{
+			LLSD args;
+			args["AMOUNT"] = llformat("%d", upload_price);
+			LLNotificationsUtil::add("UploadPayment", args);
+		}
+		// </FS:CR>
 	}
 
 	if( item_folder_id.notNull() )
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63ee29a2d1..d8adbb135d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3070,14 +3070,14 @@
                  parameter="DebugShowTime" />
             </menu_item_check>
           <menu_item_check
-             label="Show Upload Cost"
-             name="Show Upload Cost">
+             label="Show Upload Transaction"
+             name="Show Upload Transaction">
               <menu_item_check.on_check
              function="CheckControl"
-             parameter="DebugShowUploadCost" />
+             parameter="FSShowUploadPaymentToast" />
             <menu_item_check.on_click
                  function="ToggleControl"
-                 parameter="DebugShowUploadCost" />
+                 parameter="FSShowUploadPaymentToast" />
             </menu_item_check>
             <menu_item_check
              label="Show Texture Info"
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 8d68d13d99..9d412bcc46 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -59,10 +59,19 @@
      follows="left|top"
      left="20"
      top_pad="2"
-     height="18"
+     height="16"
      control_name="FSPaymentInfoInChat"
      name="FSPaymentInfoInChat"
      label="Report L$ transactions in nearby chat instead of toasts"/>
+    <check_box
+     layout="topleft"
+     follows="left|top"
+     top_pad="2"
+     height="16"
+     left="10"
+     control_name="FSShowUploadPaymentToast"
+     name="FSShowUploadPaymentToast"
+     label="When I am charged for an upload" />
 
     <check_box
      control_name="FSLandmarkCreatedNotification"