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

FIRE-10628: Option to not toast the upload payment notifications. 

Remove orphaned DebugShowUploadCost
meow-7.2.2
Cinders 2013-06-14 19:48:40 -06:00
parent 0a2579ef4d
commit fa6af6185e
5 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>

11
indra/newview/fsfloaterimport.cpp
View File

@ -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() )

13
indra/newview/llassetuploadresponders.cpp
View File

@ -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() )

8
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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"

11
indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
View File

@ -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"