1 files changed, 124 insertions, 142 deletions

diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 6775e218cb..3d87904dbe 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -1,31 +1,25 @@
 /** 
  * @file llfloatersellland.cpp
  *
- * $LicenseInfo:firstyear=2006&license=viewergpl$
- * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2006&license=viewerlgpl$
  * 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
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -34,10 +28,11 @@
 #include "llfloatersellland.h"
 
 #include "llfloateravatarpicker.h"
-#include "llfloater.h"
+#include "llfloaterreg.h"
 #include "llfloaterland.h"
 #include "lllineeditor.h"
-#include "llnotify.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
 #include "llparcel.h"
 #include "llselectmgr.h"
 #include "lltexturectrl.h"
@@ -47,7 +42,7 @@
 #include "llviewerwindow.h"
 
 // defined in llfloaterland.cpp
-void send_parcel_select_objects(S32 parcel_local_id, S32 return_type,
+void send_parcel_select_objects(S32 parcel_local_id, U32 return_type,
 								uuid_list_t* return_ids = NULL);
 
 enum Badge { BADGE_OK, BADGE_NOTE, BADGE_WARN, BADGE_ERROR };
@@ -55,10 +50,22 @@ enum Badge { BADGE_OK, BADGE_NOTE, BADGE_WARN, BADGE_ERROR };
 class LLFloaterSellLandUI
 :	public LLFloater
 {
-private:
-	LLFloaterSellLandUI();
+public:
+	LLFloaterSellLandUI(const LLSD& key);
 	virtual ~LLFloaterSellLandUI();
-
+	/*virtual*/ void onClose(bool app_quitting);
+	
+private:
+	class SelectionObserver : public LLParcelObserver
+	{
+	public:
+		SelectionObserver(LLFloaterSellLandUI* floater) : mFloater(floater) {}
+		virtual void changed();
+	private:
+		LLFloaterSellLandUI* mFloater;
+	};
+	
+private:
 	LLViewerRegion*	mRegion;
 	LLParcelSelectionHandle	mParcelSelection;
 	bool					mParcelIsForSale;
@@ -69,102 +76,80 @@ private:
 	LLUUID					mParcelSnapshot;
 	LLUUID					mAuthorizedBuyer;
 	bool					mParcelSoldWithObjects;
+	SelectionObserver 		mParcelSelectionObserver;
 	
 	void updateParcelInfo();
 	void refreshUI();
 	void setBadge(const char* id, Badge badge);
 
-	static LLFloaterSellLandUI* sInstance;
-
 	static void onChangeValue(LLUICtrl *ctrl, void *userdata);
-	static void doSelectAgent(void *userdata);
+	void doSelectAgent();
 	static void doCancel(void *userdata);
 	static void doSellLand(void *userdata);
 	bool onConfirmSale(const LLSD& notification, const LLSD& response);
 	static void doShowObjects(void *userdata);
-	static bool callbackHighlightTransferable(const LLSD& notification, const LLSD& response);
 
-	static void callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data);
+	void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids);
 
 public:
 	virtual BOOL postBuild();
 	
-	static LLFloaterSellLandUI* soleInstance(bool createIfNeeded);
-
 	bool setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel);
-
-private:
-	class SelectionObserver : public LLParcelObserver
-	{
-	public:
-		virtual void changed();
-	};
+	static bool callbackHighlightTransferable(const LLSD& notification, const LLSD& response);
 };
 
 // static
 void LLFloaterSellLand::sellLand(
 	LLViewerRegion* region, LLParcelSelectionHandle parcel)
 {
-	LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(true);
-	if (ui->setParcel(region, parcel))
-	{
-		ui->openFloater();
-	}
+	LLFloaterSellLandUI* ui = LLFloaterReg::showTypedInstance<LLFloaterSellLandUI>("sell_land");
+	ui->setParcel(region, parcel);
 }
 
 // static
-LLFloaterSellLandUI* LLFloaterSellLandUI::sInstance = NULL;
-
-// static
-LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
+LLFloater* LLFloaterSellLand::buildFloater(const LLSD& key)
 {
-	if (!sInstance  &&  createIfNeeded)
-	{
-		sInstance = new LLFloaterSellLandUI();
-
-		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_sell_land.xml");
-		sInstance->center();
-	}
-	
-
-	static SelectionObserver* parcelSelectionObserver = NULL;
-	if (!parcelSelectionObserver)
-	{
-		parcelSelectionObserver = new SelectionObserver;
-		LLViewerParcelMgr::getInstance()->addObserver(parcelSelectionObserver);
-	}
-
-	return sInstance;
+	LLFloaterSellLandUI* floater = new LLFloaterSellLandUI(key);
+	return floater;
 }
 
-LLFloaterSellLandUI::LLFloaterSellLandUI()
-:	LLFloater(),
+#if LL_WINDOWS
+// passing 'this' during construction generates a warning. The callee
+// only uses the pointer to hold a reference to 'this' which is
+// already valid, so this call does the correct thing. Disable the
+// warning so that we can compile without generating a warning.
+#pragma warning(disable : 4355)
+#endif 
+LLFloaterSellLandUI::LLFloaterSellLandUI(const LLSD& key)
+:	LLFloater(key),
+	mParcelSelectionObserver(this),
 	mRegion(0)
 {
+	LLViewerParcelMgr::getInstance()->addObserver(&mParcelSelectionObserver);
 }
 
 LLFloaterSellLandUI::~LLFloaterSellLandUI()
 {
-	if (sInstance == this)
-	{
-		sInstance = NULL;
-	}
+	LLViewerParcelMgr::getInstance()->removeObserver(&mParcelSelectionObserver);
+}
+
+// Because we are single_instance, we are not destroyed on close.
+void LLFloaterSellLandUI::onClose(bool app_quitting)
+{
+	// Must release parcel selection to allow land to deselect, see EXT-803
+	mParcelSelection = NULL;
 }
 
 void LLFloaterSellLandUI::SelectionObserver::changed()
 {
-	LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(false);
-	if (ui)
+	if (LLViewerParcelMgr::getInstance()->selectionEmpty())
 	{
-		if (LLViewerParcelMgr::getInstance()->selectionEmpty())
-		{
-			ui->closeFloater();
-		}
-		else {
-			ui->setParcel(
-				LLViewerParcelMgr::getInstance()->getSelectionRegion(),
-				LLViewerParcelMgr::getInstance()->getParcelSelection());
-		}
+		mFloater->closeFloater();
+	}
+	else if (mFloater->getVisible()) // only update selection if sell land ui in use
+	{
+		mFloater->setParcel(LLViewerParcelMgr::getInstance()->getSelectionRegion(),
+							LLViewerParcelMgr::getInstance()->getParcelSelection());
 	}
 }
 
@@ -172,18 +157,20 @@ BOOL LLFloaterSellLandUI::postBuild()
 {
 	childSetCommitCallback("sell_to", onChangeValue, this);
 	childSetCommitCallback("price", onChangeValue, this);
-	childSetPrevalidate("price", LLLineEditor::prevalidateNonNegativeS32);
+	getChild<LLLineEditor>("price")->setPrevalidate(LLTextValidate::validateNonNegativeS32);
 	childSetCommitCallback("sell_objects", onChangeValue, this);
-	childSetAction("sell_to_select_agent", doSelectAgent, this);
+	childSetAction("sell_to_select_agent", boost::bind( &LLFloaterSellLandUI::doSelectAgent, this));
 	childSetAction("cancel_btn", doCancel, this);
 	childSetAction("sell_btn", doSellLand, this);
 	childSetAction("show_objects", doShowObjects, this);
+	center();
+	getChild<LLUICtrl>("profile_scroll")->setTabStop(true);
 	return TRUE;
 }
 
 bool LLFloaterSellLandUI::setParcel(LLViewerRegion* region, LLParcelSelectionHandle parcel)
 {
-	if (!parcel->getParcel()) // || !can_agent_modify_parcel(parcel)) // can_agent_modify_parcel was deprecated by GROUPS
+	if (!parcel->getParcel())
 	{
 		return false;
 	}
@@ -214,20 +201,20 @@ void LLFloaterSellLandUI::updateParcelInfo()
 	mParcelSoldWithObjects = parcelp->getSellWithObjects();
 	if (mParcelIsForSale)
 	{
-		childSetValue("price", mParcelPrice);
+		getChild<LLUICtrl>("price")->setValue(mParcelPrice);
 		if (mParcelSoldWithObjects)
 		{
-			childSetValue("sell_objects", "yes");
+			getChild<LLUICtrl>("sell_objects")->setValue("yes");
 		}
 		else
 		{
-			childSetValue("sell_objects", "no");
+			getChild<LLUICtrl>("sell_objects")->setValue("no");
 		}
 	}
 	else
 	{
-		childSetValue("price", "");
-		childSetValue("sell_objects", "none");
+		getChild<LLUICtrl>("price")->setValue("");
+		getChild<LLUICtrl>("sell_objects")->setValue("none");
 	}
 
 	mParcelSnapshot = parcelp->getSnapshotID();
@@ -239,7 +226,7 @@ void LLFloaterSellLandUI::updateParcelInfo()
 	{
 		std::string name;
 		gCacheName->getFullName(mAuthorizedBuyer, name);
-		childSetText("sell_to_agent", name);
+		getChild<LLUICtrl>("sell_to_agent")->setValue(name);
 	}
 }
 
@@ -260,7 +247,7 @@ void LLFloaterSellLandUI::setBadge(const char* id, Badge badge)
 		case BADGE_ERROR:	badgeName = badgeError;	break;
 	}
 	
-	childSetValue(id, badgeName);
+	getChild<LLUICtrl>(id)->setValue(badgeName);
 }
 
 void LLFloaterSellLandUI::refreshUI()
@@ -269,30 +256,27 @@ void LLFloaterSellLandUI::refreshUI()
 	if (!parcelp) return;
 
 	LLTextureCtrl* snapshot = getChild<LLTextureCtrl>("info_image");
-	if (snapshot)
-	{
-		snapshot->setImageAssetID(mParcelSnapshot);
-	}
+	snapshot->setImageAssetID(mParcelSnapshot);
 
-	childSetText("info_parcel", parcelp->getName());
-	childSetTextArg("info_size", "[AREA]", llformat("%d", mParcelActualArea));
+	getChild<LLUICtrl>("info_parcel")->setValue(parcelp->getName());
+	getChild<LLUICtrl>("info_size")->setTextArg("[AREA]", llformat("%d", mParcelActualArea));
 
-	std::string price_str = childGetValue("price").asString();
+	std::string price_str = getChild<LLUICtrl>("price")->getValue().asString();
 	bool valid_price = false;
-	valid_price = (price_str != "") && LLLineEditor::prevalidateNonNegativeS32(utf8str_to_wstring(price_str));
+	valid_price = (price_str != "") && LLTextValidate::validateNonNegativeS32(utf8str_to_wstring(price_str));
 
 	if (valid_price && mParcelActualArea > 0)
 	{
 		F32 per_meter_price = 0;
 		per_meter_price = F32(mParcelPrice) / F32(mParcelActualArea);
-		childSetTextArg("price_per_m", "[PER_METER]", llformat("%0.2f", per_meter_price));
-		childShow("price_per_m");
+		getChild<LLUICtrl>("price_per_m")->setTextArg("[PER_METER]", llformat("%0.2f", per_meter_price));
+		getChildView("price_per_m")->setVisible(TRUE);
 
 		setBadge("step_price", BADGE_OK);
 	}
 	else
 	{
-		childHide("price_per_m");
+		getChildView("price_per_m")->setVisible(FALSE);
 
 		if ("" == price_str)
 		{
@@ -306,26 +290,26 @@ void LLFloaterSellLandUI::refreshUI()
 
 	if (mSellToBuyer)
 	{
-		childSetValue("sell_to", "user");
-		childShow("sell_to_agent");
-		childShow("sell_to_select_agent");
+		getChild<LLUICtrl>("sell_to")->setValue("user");
+		getChildView("sell_to_agent")->setVisible(TRUE);
+		getChildView("sell_to_select_agent")->setVisible(TRUE);
 	}
 	else
 	{
 		if (mChoseSellTo)
 		{
-			childSetValue("sell_to", "anyone");
+			getChild<LLUICtrl>("sell_to")->setValue("anyone");
 		}
 		else
 		{
-			childSetValue("sell_to", "select");
+			getChild<LLUICtrl>("sell_to")->setValue("select");
 		}
-		childHide("sell_to_agent");
-		childHide("sell_to_select_agent");
+		getChildView("sell_to_agent")->setVisible(FALSE);
+		getChildView("sell_to_select_agent")->setVisible(FALSE);
 	}
 
 	// Must select Sell To: Anybody, or User (with a specified username)
-	std::string sell_to = childGetValue("sell_to").asString();
+	std::string sell_to = getChild<LLUICtrl>("sell_to")->getValue().asString();
 	bool valid_sell_to = "select" != sell_to &&
 		("user" != sell_to || mAuthorizedBuyer.notNull());
 
@@ -338,7 +322,7 @@ void LLFloaterSellLandUI::refreshUI()
 		setBadge("step_sell_to", BADGE_OK);
 	}
 
-	bool valid_sell_objects = ("none" != childGetValue("sell_objects").asString());
+	bool valid_sell_objects = ("none" != getChild<LLUICtrl>("sell_objects")->getValue().asString());
 
 	if (!valid_sell_objects)
 	{
@@ -351,11 +335,11 @@ void LLFloaterSellLandUI::refreshUI()
 
 	if (valid_sell_to && valid_price && valid_sell_objects)
 	{
-		childEnable("sell_btn");
+		getChildView("sell_btn")->setEnabled(TRUE);
 	}
 	else
 	{
-		childDisable("sell_btn");
+		getChildView("sell_btn")->setEnabled(FALSE);
 	}
 }
 
@@ -364,7 +348,7 @@ void LLFloaterSellLandUI::onChangeValue(LLUICtrl *ctrl, void *userdata)
 {
 	LLFloaterSellLandUI *self = (LLFloaterSellLandUI *)userdata;
 
-	std::string sell_to = self->childGetValue("sell_to").asString();
+	std::string sell_to = self->getChild<LLUICtrl>("sell_to")->getValue().asString();
 
 	if (sell_to == "user")
 	{
@@ -372,7 +356,7 @@ void LLFloaterSellLandUI::onChangeValue(LLUICtrl *ctrl, void *userdata)
 		self->mSellToBuyer = true;
 		if (self->mAuthorizedBuyer.isNull())
 		{
-			doSelectAgent(self);
+			self->doSelectAgent();
 		}
 	}
 	else if (sell_to == "anyone")
@@ -381,9 +365,9 @@ void LLFloaterSellLandUI::onChangeValue(LLUICtrl *ctrl, void *userdata)
 		self->mSellToBuyer = false;
 	}
 
-	self->mParcelPrice = self->childGetValue("price");
+	self->mParcelPrice = self->getChild<LLUICtrl>("price")->getValue();
 
-	if ("yes" == self->childGetValue("sell_objects").asString())
+	if ("yes" == self->getChild<LLUICtrl>("sell_objects")->getValue().asString())
 	{
 		self->mParcelSoldWithObjects = true;
 	}
@@ -395,30 +379,26 @@ void LLFloaterSellLandUI::onChangeValue(LLUICtrl *ctrl, void *userdata)
 	self->refreshUI();
 }
 
-// static
-void LLFloaterSellLandUI::doSelectAgent(void *userdata)
+void LLFloaterSellLandUI::doSelectAgent()
 {
-	LLFloaterSellLandUI* floaterp = (LLFloaterSellLandUI*)userdata;
 	// grandparent is a floater, in order to set up dependency
-	floaterp->addDependentFloater(LLFloaterAvatarPicker::show(callbackAvatarPick, floaterp, FALSE, TRUE));
+	addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLFloaterSellLandUI::callbackAvatarPick, this, _1, _2), FALSE, TRUE));
 }
 
-// static
-void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
+void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids)
 {	
-	LLFloaterSellLandUI* floaterp = (LLFloaterSellLandUI*)data;
-	LLParcel* parcel = floaterp->mParcelSelection->getParcel();
+	LLParcel* parcel = mParcelSelection->getParcel();
 
 	if (names.empty() || ids.empty()) return;
 	
 	LLUUID id = ids[0];
 	parcel->setAuthorizedBuyerID(id);
 
-	floaterp->mAuthorizedBuyer = ids[0];
+	mAuthorizedBuyer = ids[0];
 
-	floaterp->childSetText("sell_to_agent", names[0]);
+	getChild<LLUICtrl>("sell_to_agent")->setValue(names[0]);
 
-	floaterp->refreshUI();
+	refreshUI();
 }
 
 // static
@@ -437,11 +417,13 @@ void LLFloaterSellLandUI::doShowObjects(void *userdata)
 
 	send_parcel_select_objects(parcel->getLocalID(), RT_SELL);
 
-	LLNotifications::instance().add("TransferObjectsHighlighted",
-						LLSD(), LLSD(),
-						&LLFloaterSellLandUI::callbackHighlightTransferable);
+	// we shouldn't pass callback functor since it is registered in LLFunctorRegistration
+	LLNotificationsUtil::add("TransferObjectsHighlighted",
+						LLSD(), LLSD());
 }
 
+static LLNotificationFunctorRegistration tr("TransferObjectsHighlighted", &LLFloaterSellLandUI::callbackHighlightTransferable);
+
 // static
 bool LLFloaterSellLandUI::callbackHighlightTransferable(const LLSD& notification, const LLSD& data)
 {
@@ -457,13 +439,13 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
 	LLParcel* parcel = self->mParcelSelection->getParcel();
 
 	// Do a confirmation
-	S32 sale_price = self->childGetValue("price");
+	S32 sale_price = self->getChild<LLUICtrl>("price")->getValue();
 	S32 area = parcel->getArea();
 	std::string authorizedBuyerName = "Anyone";
 	bool sell_to_anyone = true;
-	if ("user" == self->childGetValue("sell_to").asString())
+	if ("user" == self->getChild<LLUICtrl>("sell_to")->getValue().asString())
 	{
-		authorizedBuyerName = self->childGetText("sell_to_agent");
+		authorizedBuyerName = self->getChild<LLUICtrl>("sell_to_agent")->getValue().asString();
 		sell_to_anyone = false;
 	}
 
@@ -472,7 +454,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
 		&& (sale_price == 0) 
 		&& sell_to_anyone)
 	{
-		LLNotifications::instance().add("SalePriceRestriction");
+		LLNotificationsUtil::add("SalePriceRestriction");
 		return;
 	}
 
@@ -505,12 +487,12 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
 
 bool LLFloaterSellLandUI::onConfirmSale(const LLSD& notification, const LLSD& response)
 {
-	S32 option = LLNotification::getSelectedOption(notification, response);
+	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
 	if (option != 0)
 	{
 		return false;
 	}
-	S32  sale_price	= childGetValue("price");
+	S32  sale_price	= getChild<LLUICtrl>("price")->getValue();
 
 	// Valid extracted data
 	if (sale_price < 0)
@@ -532,12 +514,12 @@ bool LLFloaterSellLandUI::onConfirmSale(const LLSD& notification, const LLSD& re
 	parcel->setParcelFlag(PF_FOR_SALE, TRUE);
 	parcel->setSalePrice(sale_price);
 	bool sell_with_objects = false;
-	if ("yes" == childGetValue("sell_objects").asString())
+	if ("yes" == getChild<LLUICtrl>("sell_objects")->getValue().asString())
 	{
 		sell_with_objects = true;
 	}
 	parcel->setSellWithObjects(sell_with_objects);
-	if ("user" == childGetValue("sell_to").asString())
+	if ("user" == getChild<LLUICtrl>("sell_to")->getValue().asString())
 	{
 		parcel->setAuthorizedBuyerID(mAuthorizedBuyer);
 	}