Add an ignorable alert modal each time that the currency URI changes.

Tue, 12 Dec 2017 08:11:47 +0000

author
Beq <beqjanus@gmail.com>
date
Tue, 12 Dec 2017 08:11:47 +0000
changeset 53566
6445c3d0c08b
parent 53565
7340db9eec38
child 53567
2c408c127eca

Add an ignorable alert modal each time that the currency URI changes.

indra/newview/lfsimfeaturehandler.cpp file | annotate | diff | revisions
indra/newview/llpanelobject.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/notifications.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/lfsimfeaturehandler.cpp	Mon Dec 11 22:34:49 2017 +0100
     1.2 +++ b/indra/newview/lfsimfeaturehandler.cpp	Tue Dec 12 08:11:47 2017 +0000
     1.3 @@ -26,6 +26,7 @@
     1.4  #include "llviewerregion.h"
     1.5  
     1.6  // <COLOSI opensim multi-currency support>
     1.7 +#include "llnotificationsutil.h"
     1.8  #include "tea.h"
     1.9  #include "llstatusbar.h"
    1.10  #include "llfloaterbuycurrency.h"
    1.11 @@ -169,6 +170,10 @@
    1.12  			// <COLOSI opensim multi-currency support>
    1.13  			if (extras.has("currency-base-uri"))
    1.14  			{
    1.15 +				if (mHelperUriOverride != extras["currency-base-uri"].asString())
    1.16 +				{
    1.17 +					LLNotificationsUtil::add("CurrencyURIOverrideReceived");
    1.18 +				}
    1.19  				mHelperUriOverride = extras["currency-base-uri"].asString();
    1.20  			}
    1.21  			else
     2.1 --- a/indra/newview/llpanelobject.cpp	Mon Dec 11 22:34:49 2017 +0100
     2.2 +++ b/indra/newview/llpanelobject.cpp	Tue Dec 12 08:11:47 2017 +0000
     2.3 @@ -1643,9 +1643,6 @@
     2.4  	childSetVisible("LOD_swap_usr_label", false);
     2.5  	childSetVisible("LOD_swap_label", false);
     2.6  	childSetVisible("LOD_swap_LOD_Change_label", false);
     2.7 -	childSetVisible("LOD_swap_H2M_label", false);
     2.8 -	childSetVisible("LOD_swap_M2L_label", false);
     2.9 -	childSetVisible("LOD_swap_L2I_label", false);
    2.10  	childSetVisible("LODSwapTableDscriptionsText", false);
    2.11  	childSetVisible("LOD_swap_ll_default", false);
    2.12  	childSetVisible("LOD_swap_fs_default", false);
     3.1 --- a/indra/newview/skins/default/xui/en/notifications.xml	Mon Dec 11 22:34:49 2017 +0100
     3.2 +++ b/indra/newview/skins/default/xui/en/notifications.xml	Tue Dec 12 08:11:47 2017 +0000
     3.3 @@ -13205,4 +13205,17 @@
     3.4       name="okignore"
     3.5       yestext="OK"/>
     3.6    </notification>
     3.7 +  <notification
     3.8 +   icon="alertmodal.tga"
     3.9 +   name="CurrencyURIOverrideReceived"
    3.10 +   type="alertmodal">
    3.11 +This region has elected to specify a third-party currency portal. 
    3.12 +Please note that currency purchases made through Firestorm Viewer are transactions between you (the user) and the provider(s) or seller(s) of the currency. 
    3.13 +Neither Firestorm Viewer, the Phoenix Firestorm Viewer Project Inc., nor its team shall be liable for any cost or damage arising either directly or indirectly from any such transaction. 
    3.14 +If you do not agree to these terms of use, then no financial transactions should be conducted using this viewer.
    3.15 +   <usetemplate
    3.16 +    ignoretext="When the region sets a new currency helper."
    3.17 +    name="okignore"
    3.18 +    yestext="OK"/>
    3.19 +  </notification>
    3.20  </notifications>

mercurial