svn merge -c 73823 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-4 --> release

Cherry pick fix for showstopper fix: DEV-5701 / SVC-930: Prims set for sale - prices are incorrectly set when multiple prims taken to inventory and rezzed

indra/llinventory/llinventory.h

@@ -150,6 +150,9 @@ class LLInventoryItem : public LLInventoryObject
 		// track attachment points.
 		II_FLAGS_OBJECT_SLAM_PERM = 0x100,
 
+		// flag to indicate that the object sale information has been changed.
+		II_FLAGS_OBJECT_SLAM_SALE = 0x1000,
+
 		// These flags specify which permissions masks to overwrite
 		// upon rez.  Normally, if no permissions slam (above) or
 		// overwrite flags are set, the asset's permissions are

indra/newview/llfloaterproperties.cpp

@@ -867,6 +867,12 @@ void LLFloaterProperties::updateSaleInfo()
 		&& item->isComplete())
 	{
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
+
+		// Force an update on the sale price.
+		U32 flags = new_item->getFlags();
+		flags |= LLInventoryItem::II_FLAGS_OBJECT_SLAM_SALE;
+		new_item->setFlags(flags);
+
 		new_item->setSaleInfo(sale_info);
 		if(mObjectID.isNull())
 		{