VI-65 - Addition of Quick/Eazy Buy Web based floater.

Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard

15 files changed, 468 insertions, 17 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d77d53f6af..28a5555ca2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -91,6 +91,7 @@ set(viewer_SOURCE_FILES
     llbottomtray.cpp
     llbox.cpp
     llbreadcrumbview.cpp
+    llbuycurrencyhtml.cpp
     llcallbacklist.cpp
     llcallfloater.cpp
     llcallingcard.cpp
@@ -159,6 +160,7 @@ set(viewer_SOURCE_FILES
     llfloaterbuy.cpp
     llfloaterbuycontents.cpp
     llfloaterbuycurrency.cpp
+    llfloaterbuycurrencyhtml.cpp
     llfloaterbuyland.cpp
     llfloatercamera.cpp
     llfloatercolorpicker.cpp
@@ -604,6 +606,7 @@ set(viewer_HEADER_FILES
     llbottomtray.h
     llbox.h
     llbreadcrumbview.h
+    llbuycurrencyhtml.h
     llcallbacklist.h
     llcallfloater.h
     llcallingcard.h
@@ -674,6 +677,7 @@ set(viewer_HEADER_FILES
     llfloaterbuy.h
     llfloaterbuycontents.h
     llfloaterbuycurrency.h
+    llfloaterbuycurrencyhtml.h
     llfloaterbuyland.h
     llfloatercamera.h
     llfloatercolorpicker.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 418032c554..1d27d00451 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -6028,6 +6028,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>QuickBuyCurrency</key>
+    <map>
+      <key>Comment</key>
+      <string>Toggle between HTML based currency purchase floater and legacy XUI version</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>RegionTextureSize</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 2f90d652e4..27dcb9f1c7 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -37,7 +37,7 @@
 // viewer includes
 #include "llagent.h"
 #include "llcompilequeue.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfilepicker.h"
 #include "llinventorydefines.h"
 #include "llinventoryobserver.h"
@@ -186,7 +186,7 @@ void LLAssetUploadResponder::uploadFailure(const LLSD& content)
 		S32 price = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
 		LLStringUtil::format_map_t args;
 		args["AMOUNT"] = llformat("%d", price);
-		LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs", args), price);
+		LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("uploading_costs", args), price );
 	}
 	else
 	{
diff --git a/indra/newview/llbuycurrencyhtml.cpp b/indra/newview/llbuycurrencyhtml.cpp
new file mode 100644
index 0000000000..cb06f487e6
--- /dev/null
+++ b/indra/newview/llbuycurrencyhtml.cpp
@@ -0,0 +1,165 @@
+/** 

+ * @file llbuycurrencyhtml.cpp

+ * @brief Manages Buy Currency HTML floater

+ *

+ * $LicenseInfo:firstyear=2010&license=viewergpl$

+ * 

+ * Copyright (c) 2006-2010, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterbuycurrency.h"

+#include "llbuycurrencyhtml.h"

+#include "llfloaterbuycurrencyhtml.h"

+

+#include "llfloaterreg.h"

+#include "llcommandhandler.h"

+#include "llviewercontrol.h"

+

+// support for secondlife:///app/buycurrencyhtml/{ACTION}/{NEXT_ACTION}/{RETURN_CODE} SLapps

+class LLBuyCurrencyHTMLHandler : 

+	public LLCommandHandler

+{

+public:

+	// requests will be throttled from a non-trusted browser

+	LLBuyCurrencyHTMLHandler() : LLCommandHandler( "buycurrencyhtml", UNTRUSTED_ALLOW ) {}

+

+	bool handle(const LLSD& params, const LLSD& query_map, LLMediaCtrl* web)

+	{

+		std::string action( "" );

+		if ( params.size() >= 1 )

+		{

+			 action = params[ 0 ].asString();

+		};

+

+		std::string next_action( "" );

+		if ( params.size() >= 2 )

+		{

+			next_action = params[ 1 ].asString();

+		};

+

+		int result_code = 0;

+		if ( params.size() >= 3 )

+		{

+			result_code = params[ 2 ].asInteger();

+		};

+

+		// open the legacy XUI based currency floater

+		if ( "open_legacy" == next_action )

+		{

+			LLFloaterBuyCurrency::buyCurrency();

+		};

+

+		// ask the Buy Currency floater to close

+		// note: this is the last thing we can do so make

+		// sure any other actions are processed before this.

+		if ( "close" == action )

+		{

+			LLBuyCurrencyHTML::closeDialog();

+		};

+

+		return true;

+	};

+};

+LLBuyCurrencyHTMLHandler gBuyCurrencyHTMLHandler;

+

+////////////////////////////////////////////////////////////////////////////////

+// static

+// Opens the legacy XUI based floater or new HTML based one based on 

+// the QuickBuyCurrency value in settings.xml - this overload is for

+// the case where the amount is not requested.

+void LLBuyCurrencyHTML::openCurrencyFloater()

+{

+	if ( gSavedSettings.getBOOL( "QuickBuyCurrency" ) )

+	{

+		// HTML version

+		LLBuyCurrencyHTML::showDialog( false, "", 0 );

+	}

+	else

+	{

+		// legacy version

+		LLFloaterBuyCurrency::buyCurrency();

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// static

+// Opens the legacy XUI based floater or new HTML based one based on 

+// the QuickBuyCurrency value in settings.xml - this overload is for

+// the case where the amount and a string to display are requested.

+void LLBuyCurrencyHTML::openCurrencyFloater( const std::string& message, S32 sum )

+{

+	if ( gSavedSettings.getBOOL( "QuickBuyCurrency" ) )

+	{

+		// HTML version

+		LLBuyCurrencyHTML::showDialog( true, message, sum );

+	}

+	else

+	{

+		// legacy version

+		LLFloaterBuyCurrency::buyCurrency( message, sum );

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+// static

+void LLBuyCurrencyHTML::showDialog( bool specific_sum_requested, const std::string& message, S32 sum )

+{

+	LLFloaterBuyCurrencyHTML* buy_currency_floater = dynamic_cast< LLFloaterBuyCurrencyHTML* >( LLFloaterReg::getInstance( "buy_currency_html" ) );

+	if ( buy_currency_floater )

+	{

+		// pass on flag indicating if we want to buy specific amount and if so, how much

+		buy_currency_floater->setParams( specific_sum_requested, message, sum );

+

+		// force navigate to new URL

+		buy_currency_floater->navigateToFinalURL();

+

+		// make it visible and raise to front

+		BOOL visible = TRUE;

+		buy_currency_floater->setVisible( visible );

+		BOOL take_focus = TRUE;

+		buy_currency_floater->setFrontmost( take_focus );

+

+		// spec calls for floater to be centered on client window

+		buy_currency_floater->center();

+	}

+	else

+	{

+		llwarns << "Buy Currency (HTML) Floater not found" << llendl;

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLBuyCurrencyHTML::closeDialog()

+{

+	LLFloaterBuyCurrencyHTML* buy_currency_floater = dynamic_cast< LLFloaterBuyCurrencyHTML* >(LLFloaterReg::getInstance( "buy_currency_html" ) );

+	if ( buy_currency_floater )

+	{

+		buy_currency_floater->closeFloater();

+	};

+}

diff --git a/indra/newview/llbuycurrencyhtml.h b/indra/newview/llbuycurrencyhtml.h
new file mode 100644
index 0000000000..dbb2281343
--- /dev/null
+++ b/indra/newview/llbuycurrencyhtml.h
@@ -0,0 +1,57 @@
+/** 

+ * @file llbuycurrencyhtml.h

+ * @brief Manages Buy Currency HTML floater

+ *

+ * $LicenseInfo:firstyear=2010&license=viewergpl$

+ * 

+ * Copyright (c) 2006-2010, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLBUYCURRENCYHTML_H

+#define LL_LLBUYCURRENCYHTML_H

+

+#include "llsingleton.h"

+

+class LLFloaterBuyCurrencyHTML;

+

+class LLBuyCurrencyHTML

+{

+	public:

+		// choke point for opening a legacy or new currency floater - this overload is when the L$ sum is not required

+		static void openCurrencyFloater();

+

+		// choke point for opening a legacy or new currency floater - this overload is when the L$ sum is required

+		static void openCurrencyFloater( const std::string& message, S32 sum );

+

+		// show and give focus to actual currency floater - this is used for both cases

+		// where the sum is required and where it is not

+		static void showDialog( bool specific_sum_requested, const std::string& message, S32 sum );

+

+		// close (and destroy) the currency floater

+		static void closeDialog();

+};

+

+#endif  // LL_LLBUYCURRENCYHTML_H

diff --git a/indra/newview/llfloaterbuycurrencyhtml.cpp b/indra/newview/llfloaterbuycurrencyhtml.cpp
new file mode 100644
index 0000000000..e4be706ac4
--- /dev/null
+++ b/indra/newview/llfloaterbuycurrencyhtml.cpp
@@ -0,0 +1,119 @@
+/** 

+ * @file llfloaterbuycurrencyhtml.cpp

+ * @brief buy currency implemented in HTML floater - uses embedded media browser control

+ *

+ * $LicenseInfo:firstyear=2010&license=viewergpl$

+ * 

+ * Copyright (c) 2006-2010, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+#include "llfloaterbuycurrencyhtml.h"

+#include "llstatusbar.h"

+

+////////////////////////////////////////////////////////////////////////////////

+//

+LLFloaterBuyCurrencyHTML::LLFloaterBuyCurrencyHTML( const LLSD& key ):

+	LLFloater( key ),

+	mSpecificSumRequested( false ),

+	mMessage( "" ),

+	mSum( 0 )

+{

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+BOOL LLFloaterBuyCurrencyHTML::postBuild()

+{

+	// observer media events

+	mBrowser = getChild<LLMediaCtrl>( "browser" );

+	mBrowser->addObserver( this );

+

+	return TRUE;

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLFloaterBuyCurrencyHTML::navigateToFinalURL()

+{

+	// URL for actual currency buy contents is in XUI file

+	std::string buy_currency_url = getString( "buy_currency_url" );

+

+	// replace [LANGUAGE] meta-tag with view language

+	LLStringUtil::format_map_t replace;

+

+	// viewer language

+	replace[ "[LANGUAGE]" ] = LLUI::getLanguage();

+

+	// flag that specific amount requested 

+	replace[ "[SPECIFIC_AMOUNT]" ] = ( mSpecificSumRequested ? "y":"n" );

+

+	// amount requested

+	std::ostringstream codec( "" );

+	codec << mSum;

+	replace[ "[SUM]" ] = codec.str();

+

+	// users' current balance

+	codec.clear();

+	codec.str( "" );

+	codec << gStatusBar->getBalance();

+	replace[ "[BAL]" ] = codec.str();

+

+	// message - "This cost L$x,xxx for example

+	replace[ "[MSG]" ] = LLURI::escape( mMessage );

+	LLStringUtil::format( buy_currency_url, replace );

+

+	// kick off the navigation

+	mBrowser->navigateTo( buy_currency_url );

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLFloaterBuyCurrencyHTML::handleMediaEvent( LLPluginClassMedia* self, EMediaEvent event )

+{

+	// placeholder for now - just in case we want to catch media events

+	if ( LLPluginClassMediaOwner::MEDIA_EVENT_NAVIGATE_COMPLETE == event )

+	{

+	};

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLFloaterBuyCurrencyHTML::onClose( bool app_quitting )

+{

+	destroy();

+}

+

+////////////////////////////////////////////////////////////////////////////////

+//

+void LLFloaterBuyCurrencyHTML::setParams( bool specific_sum_requested, const std::string& message, S32 sum )

+{

+	// save these away - used to construct URL later

+	mSpecificSumRequested = specific_sum_requested;

+	mMessage = message;

+	mSum = sum;

+}

diff --git a/indra/newview/llfloaterbuycurrencyhtml.h b/indra/newview/llfloaterbuycurrencyhtml.h
new file mode 100644
index 0000000000..daee5d6f75
--- /dev/null
+++ b/indra/newview/llfloaterbuycurrencyhtml.h
@@ -0,0 +1,65 @@
+/** 

+ * @file llfloaterbuycurrencyhtml.h

+ * @brief buy currency implemented in HTML floater - uses embedded media browser control

+ *

+ * $LicenseInfo:firstyear=2010&license=viewergpl$

+ * 

+ * Copyright (c) 2006-2010, Linden Research, Inc.

+ * 

+ * Second Life Viewer Source Code

+ * The source code in this file ("Source Code") is provided by Linden Lab

+ * to you under the terms of the GNU General Public License, version 2.0

+ * ("GPL"), unless you have obtained a separate licensing agreement

+ * ("Other License"), formally executed by you and Linden Lab.  Terms of

+ * the GPL can be found in doc/GPL-license.txt in this distribution, or

+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2

+ * 

+ * There are special exceptions to the terms and conditions of the GPL as

+ * it is applied to this Source Code. View the full text of the exception

+ * in the file doc/FLOSS-exception.txt in this software distribution, or

+ * online at

+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception

+ * 

+ * By copying, modifying or distributing this software, you acknowledge

+ * that you have read and understood your obligations described above,

+ * and agree to abide by those obligations.

+ * 

+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO

+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,

+ * COMPLETENESS OR PERFORMANCE.

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLFLOATERBUYCURRENCYHTML_H

+#define LL_LLFLOATERBUYCURRENCYHTML_H

+

+#include "llfloater.h"

+#include "llmediactrl.h"

+

+class LLFloaterBuyCurrencyHTML : 

+	public LLFloater, 

+	public LLViewerMediaObserver

+{

+	public:

+		LLFloaterBuyCurrencyHTML( const LLSD& key );

+

+		/*virtual*/ BOOL postBuild();

+		/*virtual*/ void onClose( bool app_quitting );

+

+		// inherited from LLViewerMediaObserver

+		/*virtual*/ void handleMediaEvent( LLPluginClassMedia* self, EMediaEvent event );

+

+		// allow our controlling parent to tell us paramters

+		void setParams( bool specific_sum_requested, const std::string& message, S32 sum );

+

+		// parse and construct URL and set browser to navigate there.

+		void navigateToFinalURL();

+

+	private:

+		LLMediaCtrl* mBrowser;

+		bool mSpecificSumRequested;

+		std::string mMessage;

+		S32 mSum;

+};

+

+#endif  // LL_LLFLOATERBUYCURRENCYHTML_H

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index de16f9d343..39ade40967 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -48,7 +48,7 @@
 #include "llagent.h"
 #include "llavataractions.h"
 #include "llcallbacklist.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfloaterreg.h"
 #include "llinventorybridge.h"
 #include "llinventorydefines.h"
@@ -616,7 +616,7 @@ void LLTaskInvFVBridge::performAction(LLInventoryModel* model, std::string actio
 			{
 				LLStringUtil::format_map_t args;
 				args["AMOUNT"] = llformat("%d", price);
-				LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_costs", args), price);
+				LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("this_costs", args), price );
 			}
 			else
 			{
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index 1a1650c38b..c8abcc83c4 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -50,7 +50,7 @@
 #include "llagentui.h"
 #include "llappviewer.h"
 #include "llcallbacklist.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llstatusbar.h"
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
@@ -573,7 +573,7 @@ void LLPanelPlaceProfile::onForSaleBannerClick()
 			{
 				LLStringUtil::format_map_t args;
 				args["AMOUNT"] = llformat("%d", price);
-				LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("buying_selected_land", args), price);
+				LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("buying_selected_land", args), price );
 			}
 			else
 			{
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index b660a2b8ea..5628205dd4 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -41,6 +41,7 @@
 #include "llcommandhandler.h"
 #include "llviewercontrol.h"
 #include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfloaterlagmeter.h"
 #include "llpanelnearbymedia.h"
 #include "llpanelvolumepulldown.h"
@@ -509,7 +510,9 @@ S32 LLStatusBar::getSquareMetersLeft() const
 
 void LLStatusBar::onClickBuyCurrency()
 {
-	LLFloaterBuyCurrency::buyCurrency();
+	// open a currency floater - actual one open depends on 
+	// value specified in settings.xml
+	LLBuyCurrencyHTML::openCurrencyFloater();
 }
 
 static void onClickHealth(void* )
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 506cebfe73..49ea0348f9 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -49,6 +49,7 @@
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
 #include "llfloaterbuycurrency.h"
+#include "llfloaterbuycurrencyhtml.h"
 #include "llfloaterbuyland.h"
 #include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
@@ -141,6 +142,7 @@ void LLViewerFloaterReg::registerFloaters()
 	LLFloaterReg::add("beacons", "floater_beacons.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBeacons>);
 	LLFloaterReg::add("bulk_perms", "floater_bulk_perms.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBulkPermission>);
 	LLFloaterReg::add("buy_currency", "floater_buy_currency.xml", &LLFloaterBuyCurrency::buildFloater);
+	LLFloaterReg::add("buy_currency_html", "floater_buy_currency_html.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuyCurrencyHTML>);	
 	LLFloaterReg::add("buy_land", "floater_buy_land.xml", &LLFloaterBuyLand::buildFloater);
 	LLFloaterReg::add("buy_object", "floater_buy_object.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuy>);
 	LLFloaterReg::add("buy_object_contents", "floater_buy_contents.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBuyContents>);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4bfb87343c..10ceab2656 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -53,7 +53,7 @@
 //#include "llfirstuse.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfloatercustomize.h"
 #include "llfloatergodtools.h"
 #include "llfloaterinventory.h"
@@ -3288,7 +3288,7 @@ void handle_buy_object(LLSaleInfo sale_info)
 	{
 		LLStringUtil::format_map_t args;
 		args["AMOUNT"] = llformat("%d", price);
-		LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("this_object_costs", args), price);
+		LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("this_object_costs", args), price );
 		return;
 	}
 
@@ -4430,8 +4430,7 @@ void handle_buy_or_take()
 		{
 			LLStringUtil::format_map_t args;
 			args["AMOUNT"] = llformat("%d", total_price);
-			LLFloaterBuyCurrency::buyCurrency(
-					LLTrans::getString("BuyingCosts", args), total_price);
+			LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString( "BuyingCosts", args ), total_price );
 		}
 	}
 	else
@@ -5631,7 +5630,7 @@ void handle_report_abuse()
 
 void handle_buy_currency()
 {
-	LLFloaterBuyCurrency::buyCurrency();
+	LLBuyCurrencyHTML::openCurrencyFloater();
 }
 
 class LLFloaterVisible : public view_listener_t
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index c415d89e9c..5570fe5fec 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -39,7 +39,7 @@
 #include "llagentcamera.h"
 #include "llfilepicker.h"
 #include "llfloaterreg.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfloatersnapshot.h"
 #include "llimage.h"
 #include "llimagebmp.h"
@@ -811,7 +811,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
 					LLStringUtil::format_map_t args;
 					args["NAME"] = data->mAssetInfo.getName();
 					args["AMOUNT"] = llformat("%d", expected_upload_cost);
-					LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("UploadingCosts", args), expected_upload_cost);
+					LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("UploadingCosts", args), expected_upload_cost );
 					is_balance_sufficient = FALSE;
 				}
 				else if(region)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5b0b603d63..5836aff4e7 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -55,8 +55,7 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llcallingcard.h"
-//#include "llfirstuse.h"
-#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
 #include "llfloaterbuyland.h"
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
@@ -283,7 +282,7 @@ void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_
 	{
 		LLStringUtil::format_map_t args;
 		args["AMOUNT"] = llformat("%d", amount);
-		LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("giving", args), amount);
+		LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("giving", args), amount );
 	}
 }
 
diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
new file mode 100644
index 0000000000..ab44082070
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency_html.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="false"
+ height="240"
+ layout="topleft"
+ min_height="240"
+ min_width="420"
+ name="floater_buy_currency_html"
+ help_topic="floater_buy_currency_html"
+ save_rect="true"
+ single_instance="true"
+ title="BUY CURRENCY"
+ width="422">
+ <floater.string
+      name="buy_currency_url" translate="false">
+        http://user.lindenlab.com/~callum/ez/index.php?lang=[LANGUAGE]&amp;sa=[SPECIFIC_AMOUNT]&amp;sum=[SUM]&amp;msg=[MSG]&amp;bal=[BAL]
+</floater.string>
+    <web_browser
+     bottom="238"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="2"
+     name="browser"
+     top="18"
+     width="420" />
+</floater>