Renamed llgivemoney.h/cpp to llfloaterpay.h/cpp, the class it contains. Not reviewed.

6 files changed, 606 insertions, 5 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d368dd5497..747eb5d19b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -187,6 +187,7 @@ set(viewer_SOURCE_FILES
     llfloaternotificationsconsole.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
+    llfloaterpay.cpp
     llfloaterperms.cpp
     llfloaterpostcard.cpp
     llfloaterpostprocess.cpp
@@ -218,7 +219,6 @@ set(viewer_SOURCE_FILES
     llfollowcam.cpp
     llfriendcard.cpp
     llgesturemgr.cpp
-    llgivemoney.cpp
     llglsandbox.cpp
     llgroupactions.cpp
     llgrouplist.cpp
@@ -658,6 +658,7 @@ set(viewer_HEADER_FILES
     llfloaternotificationsconsole.h
     llfloateropenobject.h
     llfloaterparcel.h
+    llfloaterpay.h
     llfloaterpostcard.h
     llfloaterpostprocess.h
     llfloaterpreference.h
@@ -690,7 +691,6 @@ set(viewer_HEADER_FILES
     llfollowcam.h
     llfriendcard.h
     llgesturemgr.h
-    llgivemoney.h
     llgroupactions.h
     llgrouplist.h
     llgroupmgr.h
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index 92b2768f39..f020ff4704 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -48,7 +48,7 @@
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterreg.h"
-#include "llgivemoney.h"
+#include "llfloaterpay.h"
 #include "llinventorymodel.h"	// for gInventory.findCategoryUUIDForType
 #include "llimview.h"			// for gIMMgr
 #include "llmutelist.h"
diff --git a/indra/newview/llfloaterpay.cpp b/indra/newview/llfloaterpay.cpp
new file mode 100644
index 0000000000..1c1e8445ad
--- /dev/null
+++ b/indra/newview/llfloaterpay.cpp
@@ -0,0 +1,498 @@
+/** 
+ * @file llfloaterpay.cpp
+ * @author Aaron Brashears, Kelly Washington, James Cook
+ * @brief Implementation of the LLFloaterPay class.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, 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 "llfloaterpay.h"
+
+#include "message.h"
+
+#include "llagent.h"
+#include "llfloaterreg.h"
+#include "llresmgr.h"
+#include "lltextbox.h"
+#include "lllineeditor.h"
+#include "llmutelist.h"
+#include "llfloaterreporter.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llbutton.h"
+#include "llselectmgr.h"
+#include "lltransactiontypes.h"
+#include "lluictrlfactory.h"
+
+///----------------------------------------------------------------------------
+/// Local function declarations, constants, enums, and typedefs
+///----------------------------------------------------------------------------
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLGiveMoneyInfo
+//
+// A small class used to track callback information
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+struct LLGiveMoneyInfo
+{
+	LLFloaterPay* mFloater;
+	S32 mAmount;
+	LLGiveMoneyInfo(LLFloaterPay* floater, S32 amount) :
+		mFloater(floater), mAmount(amount){}
+};
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterPay
+///----------------------------------------------------------------------------
+
+S32 LLFloaterPay::sLastAmount = 0;
+const S32 MAX_AMOUNT_LENGTH = 10;
+const S32 FASTPAY_BUTTON_WIDTH = 80;
+
+LLFloaterPay::LLFloaterPay(const LLSD& key)
+	: LLFloater(key),
+	  mCallbackData(),
+	  mCallback(NULL),
+	  mObjectNameText(NULL),
+	  mTargetUUID(key.asUUID()),
+	  mTargetIsGroup(FALSE)
+{
+	mCloseSignal.connect(boost::bind(&LLFloaterPay::onClose, this));
+}
+
+// Destroys the object
+LLFloaterPay::~LLFloaterPay()
+{
+	std::for_each(mCallbackData.begin(), mCallbackData.end(), DeletePointer());
+	// Name callbacks will be automatically disconnected since LLFloater is trackable
+}
+
+BOOL LLFloaterPay::postBuild()
+{
+	S32 i = 0;
+	
+	LLGiveMoneyInfo* info = new LLGiveMoneyInfo(this, PAY_BUTTON_DEFAULT_0);
+	mCallbackData.push_back(info);
+
+	childSetAction("fastpay 1",&LLFloaterPay::onGive,info);
+	childSetVisible("fastpay 1", FALSE);
+
+	mQuickPayButton[i] = getChild<LLButton>("fastpay 1");
+	mQuickPayInfo[i] = info;
+	++i;
+
+	info = new LLGiveMoneyInfo(this, PAY_BUTTON_DEFAULT_1);
+	mCallbackData.push_back(info);
+
+	childSetAction("fastpay 5",&LLFloaterPay::onGive,info);
+	childSetVisible("fastpay 5", FALSE);
+
+	mQuickPayButton[i] = getChild<LLButton>("fastpay 5");
+	mQuickPayInfo[i] = info;
+	++i;
+
+	info = new LLGiveMoneyInfo(this, PAY_BUTTON_DEFAULT_2);
+	mCallbackData.push_back(info);
+
+	childSetAction("fastpay 10",&LLFloaterPay::onGive,info);
+	childSetVisible("fastpay 10", FALSE);
+
+	mQuickPayButton[i] = getChild<LLButton>("fastpay 10");
+	mQuickPayInfo[i] = info;
+	++i;
+
+	info = new LLGiveMoneyInfo(this, PAY_BUTTON_DEFAULT_3);
+	mCallbackData.push_back(info);
+
+	childSetAction("fastpay 20",&LLFloaterPay::onGive,info);
+	childSetVisible("fastpay 20", FALSE);
+
+	mQuickPayButton[i] = getChild<LLButton>("fastpay 20");
+	mQuickPayInfo[i] = info;
+	++i;
+
+
+	childSetVisible("amount text", FALSE);	
+
+	std::string last_amount;
+	if(sLastAmount > 0)
+	{
+		last_amount = llformat("%d", sLastAmount);
+	}
+
+	childSetVisible("amount", FALSE);
+
+	getChild<LLLineEditor>("amount")->setKeystrokeCallback(&LLFloaterPay::onKeystroke, this);
+	childSetText("amount", last_amount);
+	childSetPrevalidate("amount", LLLineEditor::prevalidateNonNegativeS32);
+
+	info = new LLGiveMoneyInfo(this, 0);
+	mCallbackData.push_back(info);
+
+	childSetAction("pay btn",&LLFloaterPay::onGive,info);
+	setDefaultBtn("pay btn");
+	childSetVisible("pay btn", FALSE);
+	childSetEnabled("pay btn", (sLastAmount > 0));
+
+	childSetAction("cancel btn",&LLFloaterPay::onCancel,this);
+
+	return TRUE;
+}
+
+void LLFloaterPay::onClose()
+{
+	// Deselect the objects
+	mObjectSelection = NULL;
+}
+
+// static
+void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
+{
+	LLFloaterPay* self = (LLFloaterPay*)userdata;
+	if (self)
+	{
+		S32 price;
+		LLUUID target;
+
+		msg->getUUIDFast(_PREHASH_ObjectData,_PREHASH_ObjectID,target);
+		if (target != self->mTargetUUID)
+		{
+			// This is a message for a different object's pay info
+			return;
+		}
+
+		msg->getS32Fast(_PREHASH_ObjectData,_PREHASH_DefaultPayPrice,price);
+		
+		if (PAY_PRICE_HIDE == price)
+		{
+			self->childSetVisible("amount", FALSE);
+			self->childSetVisible("pay btn", FALSE);
+			self->childSetVisible("amount text", FALSE);
+		}
+		else if (PAY_PRICE_DEFAULT == price)
+		{			
+			self->childSetVisible("amount", TRUE);
+			self->childSetVisible("pay btn", TRUE);
+			self->childSetVisible("amount text", TRUE);
+		}
+		else
+		{
+			// PAY_PRICE_HIDE and PAY_PRICE_DEFAULT are negative values
+			// So we take the absolute value here after we have checked for those cases
+			
+			self->childSetVisible("amount", TRUE);
+			self->childSetVisible("pay btn", TRUE);
+			self->childSetEnabled("pay btn", TRUE);
+			self->childSetVisible("amount text", TRUE);
+
+			self->childSetText("amount", llformat("%d", llabs(price)));
+		}
+
+		S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_ButtonData);
+		S32 i = 0;
+		if (num_blocks > MAX_PAY_BUTTONS) num_blocks = MAX_PAY_BUTTONS;
+
+		S32 max_pay_amount = 0;
+		S32 padding_required = 0;
+
+		for (i=0;i<num_blocks;++i)
+		{
+			S32 pay_button;
+			msg->getS32Fast(_PREHASH_ButtonData,_PREHASH_PayButton,pay_button,i);
+			if (pay_button > 0)
+			{
+				std::string button_str = "L$";
+				button_str += LLResMgr::getInstance()->getMonetaryString( pay_button );
+
+				self->mQuickPayButton[i]->setLabelSelected(button_str);
+				self->mQuickPayButton[i]->setLabelUnselected(button_str);
+				self->mQuickPayButton[i]->setVisible(TRUE);
+				self->mQuickPayInfo[i]->mAmount = pay_button;
+				self->childSetVisible("fastpay text",TRUE);
+
+				if ( pay_button > max_pay_amount )
+				{
+					max_pay_amount = pay_button;
+				}
+			}
+			else
+			{
+				self->mQuickPayButton[i]->setVisible(FALSE);
+			}
+		}
+
+		// build a string containing the maximum value and calc nerw button width from it.
+		std::string balance_str = "L$";
+		balance_str += LLResMgr::getInstance()->getMonetaryString( max_pay_amount );
+		const LLFontGL* font = LLFontGL::getFontSansSerif();
+		S32 new_button_width = font->getWidth( std::string(balance_str));
+		new_button_width += ( 12 + 12 );	// padding
+
+		// dialong is sized for 2 digit pay amounts - larger pay values need to be scaled
+		const S32 threshold = 100000;
+		if ( max_pay_amount >= threshold )
+		{
+			S32 num_digits_threshold = (S32)log10((double)threshold) + 1;
+			S32 num_digits_max = (S32)log10((double)max_pay_amount) + 1;
+				
+			// calculate the extra width required by 2 buttons with max amount and some commas
+			padding_required = ( num_digits_max - num_digits_threshold + ( num_digits_max / 3 ) ) * font->getWidth( std::string("0") );
+		};
+
+		// change in button width
+		S32 button_delta = new_button_width - FASTPAY_BUTTON_WIDTH;
+		if ( button_delta < 0 ) 
+			button_delta = 0;
+
+		// now we know the maximum amount, we can resize all the buttons to be 
+		for (i=0;i<num_blocks;++i)
+		{
+			LLRect r;
+			r = self->mQuickPayButton[i]->getRect();
+
+			// RHS button colum needs to move further because LHS changed too
+			if ( i % 2 )
+			{
+				r.setCenterAndSize( r.getCenterX() + ( button_delta * 3 ) / 2 , 
+					r.getCenterY(), 
+						r.getWidth() + button_delta, 
+							r.getHeight() ); 
+			}
+			else
+			{
+				r.setCenterAndSize( r.getCenterX() + button_delta / 2, 
+					r.getCenterY(), 
+						r.getWidth() + button_delta, 
+						r.getHeight() ); 
+			}
+			self->mQuickPayButton[i]->setRect( r );
+		}
+
+		for (i=num_blocks;i<MAX_PAY_BUTTONS;++i)
+		{
+			self->mQuickPayButton[i]->setVisible(FALSE);
+		}
+
+		self->reshape( self->getRect().getWidth() + padding_required, self->getRect().getHeight(), FALSE );
+	}
+	msg->setHandlerFunc("PayPriceReply",NULL,NULL);
+}
+
+// static
+void LLFloaterPay::payViaObject(money_callback callback, LLSafeHandle<LLObjectSelection> selection)
+{
+	// Object that lead to the selection, may be child
+	LLViewerObject* object = selection->getPrimaryObject();
+	if (!object)
+		return;
+	
+	LLFloaterPay *floater = LLFloaterReg::showTypedInstance<LLFloaterPay>("pay_object", LLSD(object->getID()));
+	if (!floater)
+		return;
+	
+	floater->setCallback(callback);
+	// Hold onto the selection until we close
+	floater->mObjectSelection = selection;
+
+	LLSelectNode* node = selection->getFirstRootNode();
+	if (!node) 
+	{
+		//FIXME: notify user object no longer exists
+		floater->closeFloater();
+		return;
+	}
+	
+	LLHost target_region = object->getRegion()->getHost();
+	
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessageFast(_PREHASH_RequestPayPrice);
+	msg->nextBlockFast(_PREHASH_ObjectData);
+	msg->addUUIDFast(_PREHASH_ObjectID, object->getID());
+	msg->sendReliable(target_region);
+	msg->setHandlerFuncFast(_PREHASH_PayPriceReply, processPayPriceReply,(void **)floater);
+	
+	LLUUID owner_id;
+	BOOL is_group = FALSE;
+	node->mPermissions->getOwnership(owner_id, is_group);
+	
+	floater->childSetText("object_name_text",node->mName);
+
+	floater->finishPayUI(owner_id, is_group);
+}
+
+void LLFloaterPay::payDirectly(money_callback callback, 
+							   const LLUUID& target_id,
+							   BOOL is_group)
+{
+	LLFloaterPay *floater = LLFloaterReg::showTypedInstance<LLFloaterPay>("pay_resident", LLSD(target_id));
+	if (!floater)
+		return;
+	
+	floater->setCallback(callback);
+	floater->mObjectSelection = NULL;
+	
+	floater->childSetVisible("amount", TRUE);
+	floater->childSetVisible("pay btn", TRUE);
+	floater->childSetVisible("amount text", TRUE);
+
+	floater->childSetVisible("fastpay text",TRUE);
+	for(S32 i=0;i<MAX_PAY_BUTTONS;++i)
+	{
+		floater->mQuickPayButton[i]->setVisible(TRUE);
+	}
+	
+	floater->finishPayUI(target_id, is_group);
+}
+	
+void LLFloaterPay::finishPayUI(const LLUUID& target_id, BOOL is_group)
+{
+	gCacheName->get(target_id, is_group, boost::bind(&LLFloaterPay::onCacheOwnerName, this, _1, _2, _3, _4));
+
+	// Make sure the amount field has focus
+
+	childSetFocus("amount", TRUE);
+	
+	LLLineEditor* amount = getChild<LLLineEditor>("amount");
+	amount->selectAll();
+	mTargetIsGroup = is_group;
+}
+
+void LLFloaterPay::onCacheOwnerName(const LLUUID& owner_id,
+									const std::string& firstname,
+									const std::string& lastname,
+									BOOL is_group)
+{
+	if (is_group)
+	{
+		childSetVisible("payee_group",true);
+		childSetVisible("payee_resident",false);
+	}
+	else
+	{
+		childSetVisible("payee_group",false);
+		childSetVisible("payee_resident",true);
+	}
+	
+	childSetTextArg("payee_name", "[FIRST]", firstname);
+	childSetTextArg("payee_name", "[LAST]", lastname);
+}
+
+// static
+void LLFloaterPay::onCancel(void* data)
+{
+	LLFloaterPay* self = reinterpret_cast<LLFloaterPay*>(data);
+	if(self)
+	{
+		self->closeFloater();
+	}
+}
+
+// static
+void LLFloaterPay::onKeystroke(LLLineEditor*, void* data)
+{
+	LLFloaterPay* self = reinterpret_cast<LLFloaterPay*>(data);
+	if(self)
+	{
+		// enable the Pay button when amount is non-empty and positive, disable otherwise
+		std::string amtstr = self->childGetText("amount");
+		self->childSetEnabled("pay btn", !amtstr.empty() && atoi(amtstr.c_str()) > 0);
+	}
+}
+
+// static
+void LLFloaterPay::onGive(void* data)
+{
+	LLGiveMoneyInfo* info = reinterpret_cast<LLGiveMoneyInfo*>(data);
+	if(info && info->mFloater)
+	{
+		info->mFloater->give(info->mAmount);
+		info->mFloater->closeFloater();
+	}
+}
+
+void LLFloaterPay::give(S32 amount)
+{
+	if(mCallback)
+	{
+		// if the amount is 0, that menas that we should use the
+		// text field.
+		if(amount == 0)
+		{
+			amount = atoi(childGetText("amount").c_str());
+		}
+		sLastAmount = amount;
+
+		// Try to pay an object.
+		if (mObjectSelection.notNull())
+		{
+			LLViewerObject* dest_object = gObjectList.findObject(mTargetUUID);
+			if(dest_object)
+			{
+				LLViewerRegion* region = dest_object->getRegion();
+				if (region)
+				{
+					// Find the name of the root object
+					LLSelectNode* node = mObjectSelection->getFirstRootNode();
+					std::string object_name;
+					if (node)
+					{
+						object_name = node->mName;
+					}
+					S32 tx_type = TRANS_PAY_OBJECT;
+					if(dest_object->isAvatar()) tx_type = TRANS_GIFT;
+					mCallback(mTargetUUID, region, amount, FALSE, tx_type, object_name);
+					mObjectSelection = NULL;
+
+					// request the object owner in order to check if the owner needs to be unmuted
+					LLMessageSystem* msg = gMessageSystem;
+					msg->newMessageFast(_PREHASH_RequestObjectPropertiesFamily);
+					msg->nextBlockFast(_PREHASH_AgentData);
+					msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+					msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+					msg->nextBlockFast(_PREHASH_ObjectData);
+					msg->addU32Fast(_PREHASH_RequestFlags, OBJECT_PAY_REQUEST );
+					msg->addUUIDFast(_PREHASH_ObjectID, 	mTargetUUID);
+					msg->sendReliable( region->getHost() );
+				}
+			}
+		}
+		else
+		{
+			// just transfer the L$
+			mCallback(mTargetUUID, gAgent.getRegion(), amount, mTargetIsGroup, TRANS_GIFT, LLStringUtil::null);
+
+			// check if the payee needs to be unmuted
+			LLMuteList::getInstance()->autoRemove(mTargetUUID, LLMuteList::AR_MONEY);
+		}
+	}
+}
diff --git a/indra/newview/llfloaterpay.h b/indra/newview/llfloaterpay.h
new file mode 100644
index 0000000000..c6ce595186
--- /dev/null
+++ b/indra/newview/llfloaterpay.h
@@ -0,0 +1,103 @@
+/** 
+ * @file llfloaterpay.h
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, 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 LLFLOATERPAY_H
+#define LLFLOATERPAY_H
+
+#include "lluuid.h"
+#include "llfloater.h"
+#include "lllslconstants.h"
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLFloaterPay
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class LLViewerRegion;
+class LLLineEditor;
+class LLTextBox;
+class LLButton;
+class LLObjectSelection;
+struct LLGiveMoneyInfo;
+
+typedef void (*money_callback)(const LLUUID&, LLViewerRegion*,S32,BOOL,S32,const std::string&);
+
+class LLFloaterPay : public LLFloater
+{
+public:
+	LLFloaterPay(const LLSD& key);
+	virtual ~LLFloaterPay();
+	/*virtual*/	BOOL	postBuild();
+	
+	void setCallback(money_callback callback) { mCallback = callback; }
+	
+	void onClose();
+
+	// Pay into an in-world object, which will trigger scripts and eventually
+	// transfer the L$ to the resident or group that owns the object.
+	// Object must be selected.  It may be a child.
+	static void payViaObject(money_callback callback, LLSafeHandle<LLObjectSelection> selection);
+	
+	// Pay an avatar or group directly, not via an object in the world.
+	// Scripts are not notified, L$ can be direcly transferred.
+	static void payDirectly(money_callback callback,
+							const LLUUID& target_id,
+							BOOL is_group);
+
+private:
+	static void onCancel(void* data);
+	static void onKeystroke(LLLineEditor* editor, void* data);
+	static void onGive(void* data);
+	void give(S32 amount);
+	static void processPayPriceReply(LLMessageSystem* msg, void **userdata);
+	void onCacheOwnerName(const LLUUID& owner_id,
+						  const std::string& firstname,
+						  const std::string& lastname,
+						  BOOL is_group);
+	void finishPayUI(const LLUUID& target_id, BOOL is_group);
+
+protected:
+	std::vector<LLGiveMoneyInfo*> mCallbackData;
+	money_callback mCallback;
+	LLTextBox* mObjectNameText;
+	LLUUID mTargetUUID;
+	BOOL mTargetIsGroup;
+	BOOL mHaveName;
+
+	LLButton* mQuickPayButton[MAX_PAY_BUTTONS];
+	LLGiveMoneyInfo* mQuickPayInfo[MAX_PAY_BUTTONS];
+
+	LLSafeHandle<LLObjectSelection> mObjectSelection;
+
+	static S32 sLastAmount;
+};
+
+
+#endif // LLFLOATERPAY_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 0b21f3565d..ab29311aaf 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -83,7 +83,7 @@
 #include "llfloaternamedesc.h"
 #include "llfloaternotificationsconsole.h"
 #include "llfloateropenobject.h"
-#include "llgivemoney.h"
+#include "llfloaterpay.h"
 #include "llfloaterparcel.h"
 #include "llfloaterperms.h"
 #include "llfloaterpostcard.h"
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 4c6abd7edb..3e036f4978 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -111,6 +111,7 @@
 #include "llfloaterlandholdings.h"
 #include "llfloatermap.h"
 #include "llfloateropenobject.h"
+#include "llfloaterpay.h"
 #include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
@@ -129,7 +130,6 @@
 #include "llavataractions.h"
 #include "lllandmarkactions.h"
 #include "llmemoryview.h"
-#include "llgivemoney.h"
 #include "llgroupmgr.h"
 #include "lltooltip.h"
 #include "llhudeffecttrail.h"