Fixed Windows line endings that crept in

4 files changed, 406 insertions, 406 deletions

diff --git a/indra/newview/llbuycurrencyhtml.cpp b/indra/newview/llbuycurrencyhtml.cpp
index cb06f487e6..163829a1ea 100644
--- a/indra/newview/llbuycurrencyhtml.cpp
+++ b/indra/newview/llbuycurrencyhtml.cpp
@@ -1,165 +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();

-	};

-}

+/** 
+ * @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
index dbb2281343..3435bb0451 100644
--- a/indra/newview/llbuycurrencyhtml.h
+++ b/indra/newview/llbuycurrencyhtml.h
@@ -1,57 +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

+/** 
+ * @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
index e4be706ac4..5815df36d1 100644
--- a/indra/newview/llfloaterbuycurrencyhtml.cpp
+++ b/indra/newview/llfloaterbuycurrencyhtml.cpp
@@ -1,119 +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;

-}

+/** 
+ * @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
index daee5d6f75..be7a4d3dd6 100644
--- a/indra/newview/llfloaterbuycurrencyhtml.h
+++ b/indra/newview/llfloaterbuycurrencyhtml.h
@@ -1,65 +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

+/** 
+ * @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