EFFECTIVE MERGES:

svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated

1 files changed, 109 insertions, 52 deletions

diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 7110ea4f93..449783285c 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -98,8 +98,8 @@ BOOL LLPanelPermissions::postBuild()
 	
 	this->childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this);
 
-	this->childSetCommitCallback("EdCost",LLPanelPermissions::onCommitSaleInfo,this);
-	this->childSetPrevalidate("EdCost",LLLineEditor::prevalidateNonNegativeS32);
+	this->childSetCommitCallback("Edit Cost",LLPanelPermissions::onCommitSaleInfo,this);
+	this->childSetPrevalidate("Edit Cost",LLLineEditor::prevalidateNonNegativeS32);
 
 	this->childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this);
 	
@@ -229,9 +229,10 @@ void LLPanelPermissions::refresh()
 			RadioSaleType->setEnabled(FALSE);
 		}
 		
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Cost",LLString(childGetText("Cost Default")));
+		childSetText("Edit Cost",LLString::null);
+		childSetEnabled("Edit Cost",false);
 		
 		childSetEnabled("label click action",false);
 		LLComboBox*	ComboClickAction = getChild<LLComboBox>("clickaction");
@@ -416,56 +417,92 @@ void LLPanelPermissions::refresh()
 	childSetText("prim info",object_info_string);
 	childSetEnabled("prim info",true);
 
-	S32 price;
-	BOOL is_for_sale = LLSelectMgr::getInstance()->selectIsForSale(price);
-	if (!is_for_sale)
-	{
-		price = DEFAULT_PRICE;
-	}
-
-	BOOL self_owned = (gAgent.getID() == mOwnerID);
-	BOOL group_owned = LLSelectMgr::getInstance()->selectIsGroupOwned() ;
-	BOOL public_owned = (mOwnerID.isNull() && !LLSelectMgr::getInstance()->selectIsGroupOwned());
-	BOOL can_transfer = LLSelectMgr::getInstance()->selectGetRootsTransfer();
-	BOOL can_copy = LLSelectMgr::getInstance()->selectGetRootsCopy();
+	S32 total_sale_price = 0;
+	S32 individual_sale_price = 0;
+	BOOL is_for_sale_mixed = FALSE;
+	BOOL is_sale_price_mixed = FALSE;
+	U32 num_for_sale = FALSE;
+    LLSelectMgr::getInstance()->selectGetAggregateSaleInfo(num_for_sale,
+										   is_for_sale_mixed,
+										   is_sale_price_mixed,
+										   total_sale_price,
+										   individual_sale_price);
+
+	const BOOL self_owned = (gAgent.getID() == mOwnerID);
+	const BOOL group_owned = LLSelectMgr::getInstance()->selectIsGroupOwned() ;
+	const BOOL public_owned = (mOwnerID.isNull() && !LLSelectMgr::getInstance()->selectIsGroupOwned());
+	const BOOL can_transfer = LLSelectMgr::getInstance()->selectGetRootsTransfer();
+	const BOOL can_copy = LLSelectMgr::getInstance()->selectGetRootsCopy();
 
 	if(!owners_identical)
 	{
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Edit Cost",LLString::null);
+		childSetEnabled("Edit Cost",false);
 	}
+	// You own these objects.
 	else if(self_owned || (group_owned && gAgent.hasPowerInGroup(group_id,GP_OBJECT_SET_SALE)))
 	{
-		LLLineEditor*	EditPrice = getChild<LLLineEditor>("EdCost");
-		if(keyboard_focus_view != EditPrice)
+		// If there are multiple items for sale then set text to PRICE PER UNIT.
+		if (num_for_sale > 1)
 		{
-			childSetText("EdCost",llformat("%d",price));
+			childSetText("Cost",childGetText("Cost Per Unit"));
 		}
-		if(is_for_sale && is_one_object && can_transfer)
+		else
 		{
-			childSetEnabled("Price:  L$",true);
-			childSetEnabled("EdCost",true);
+			childSetText("Cost",childGetText("Cost Default"));
 		}
-		else
+		
+		LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost");
+		if(keyboard_focus_view != editPrice)
 		{
-			childSetEnabled("Price:  L$",false);
-			childSetEnabled("EdCost",false);
+			// If the sale price is mixed then set the cost to MIXED, otherwise
+			// set to the actual cost.
+			if (num_for_sale > 0 && is_for_sale_mixed)
+			{
+				childSetText("Edit Cost",childGetText("Sale Mixed"));
+			}
+			else if (num_for_sale > 0 && is_sale_price_mixed)
+			{
+				childSetText("Edit Cost",childGetText("Cost Mixed"));
+			}
+			else 
+			{
+				childSetText("Edit Cost",llformat("%d",individual_sale_price));
+			}
 		}
+		// The edit fields are only enabled if you can sell this object
+		// and the sale price is not mixed.
+		bool enable_edit = (num_for_sale && can_transfer) ? !is_for_sale_mixed : false;
+		childSetEnabled("Cost",enable_edit);
+		childSetEnabled("Edit Cost",enable_edit);
 	}
+	// Someone, not you, owns these objects.
 	else if(!public_owned)
 	{
-		// ...someone, not you, owns it
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",llformat("%d",price));
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetEnabled("Edit Cost",false);
+		
+		// Don't show a price if none of the items are for sale.
+		if (num_for_sale)
+			childSetText("Edit Cost",llformat("%d",total_sale_price));
+		else
+			childSetText("Edit Cost",LLString::null);
+
+		// If multiple items are for sale, set text to TOTAL PRICE.
+		if (num_for_sale > 1)
+			childSetText("Cost",childGetText("Cost Total"));
+		else
+			childSetText("Cost",childGetText("Cost Default"));
 	}
+	// This is a public object.
 	else
 	{
-		// ...public object
-		childSetEnabled("Price:  L$",false);
-		childSetText("EdCost",LLString::null);
-		childSetEnabled("EdCost",false);
+		childSetEnabled("Cost",false);
+		childSetText("Cost",childGetText("Cost Default"));
+		
+		childSetText("Edit Cost",LLString::null);
+		childSetEnabled("Edit Cost",false);
 	}
 
 	// Enable and disable the permissions checkboxes
@@ -601,8 +638,11 @@ void LLPanelPermissions::refresh()
 
 	if (has_change_sale_ability && (owner_mask_on & PERM_TRANSFER))
 	{
-		childSetEnabled("checkbox for sale", can_transfer || (!can_transfer && is_for_sale));
-		childSetEnabled("sale type",is_for_sale && can_transfer);
+		childSetEnabled("checkbox for sale", can_transfer || (!can_transfer && num_for_sale));
+		// Set the checkbox to tentative if the prices of each object selected
+		// are not the same.
+		childSetTentative("checkbox for sale", is_for_sale_mixed);
+		childSetEnabled("sale type",num_for_sale && can_transfer && !is_sale_price_mixed);
 
 		childSetEnabled("Next owner can:", TRUE);
 		childSetEnabled("checkbox next owner can modify",base_mask_on & PERM_MODIFY);
@@ -744,21 +784,23 @@ void LLPanelPermissions::refresh()
 		if (valid_sale_info)
 		{
 			RadioSaleType->setSelectedIndex((S32)sale_type - 1);
+			RadioSaleType->setTentative(FALSE); // unfortunately this doesn't do anything at the moment.
 		}
 		else
 		{
 			// default option is sell copy, determined to be safest
 			RadioSaleType->setSelectedIndex((S32)LLSaleInfo::FS_COPY - 1);
+			RadioSaleType->setTentative(TRUE); // unfortunately this doesn't do anything at the moment.
 		}
 	}
 
-	childSetValue("checkbox for sale", is_for_sale);
+	childSetValue("checkbox for sale", num_for_sale != 0);
 
 	// HACK: There are some old objects in world that are set for sale,
 	// but are no-transfer.  We need to let users turn for-sale off, but only
 	// if for-sale is set.
 	bool cannot_actually_sell = !can_transfer || (!can_copy && sale_type == LLSaleInfo::FS_COPY);
-	if (is_for_sale && has_change_sale_ability && cannot_actually_sell)
+	if (num_for_sale && has_change_sale_ability && cannot_actually_sell)
 	{
 		childSetEnabled("checkbox for sale", true);
 	}
@@ -982,9 +1024,10 @@ void LLPanelPermissions::setAllSaleInfo()
 	llinfos << "LLPanelPermissions::setAllSaleInfo()" << llendl;
 	LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_NOT;
 
-	LLCheckBoxCtrl*	mCheckPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
-
-	if(mCheckPurchase && mCheckPurchase->get())
+	LLCheckBoxCtrl *checkPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
+	
+	// Set the sale type if the object(s) are for sale.
+	if(checkPurchase && checkPurchase->get())
 	{
 		LLRadioGroup* RadioSaleType = getChild<LLRadioGroup>("sale type");
 		if(RadioSaleType)
@@ -1006,23 +1049,37 @@ void LLPanelPermissions::setAllSaleInfo()
 			}
 		}
 	}
-	LLLineEditor*	mEditPrice = getChild<LLLineEditor>("EdCost");
 
 	S32 price = -1;
-	if(mEditPrice)
+	
+	LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost");
+	if (editPrice)
 	{
-		price = atoi(mEditPrice->getText().c_str());
+		// Don't extract the price if it's labeled as MIXED or is empty.
+		const char *editPriceString = editPrice->getText().c_str();
+		if (0 != strcmp(editPriceString,childGetText("Cost Mixed").c_str()) &&
+			0 != strcmp(editPriceString,""))
+		{
+			price = atoi(editPriceString);
+		}
+		else
+		{
+			price = DEFAULT_PRICE;
+		}
 	}
-	// Invalid data - turn off the sale
+	// If somehow an invalid price, turn the sale off.
 	if (price < 0)
-	{
 		sale_type = LLSaleInfo::FS_NOT;
-		price = 0;
-	}
 
+	// Force the sale price of not-for-sale items to DEFAULT_PRICE.
+	if (sale_type == LLSaleInfo::FS_NOT)
+	{
+		price = DEFAULT_PRICE;
+	}
+	// Pack up the sale info and send the update.
 	LLSaleInfo sale_info(sale_type, price);
 	LLSelectMgr::getInstance()->selectionSetObjectSaleInfo(sale_info);
-
+	
 	// If turned off for-sale, make sure click-action buy is turned
 	// off as well
 	if (sale_type == LLSaleInfo::FS_NOT)