svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

4 files changed, 16 insertions, 19 deletions

diff --git a/indra/llinventory/lleconomy.cpp b/indra/llinventory/lleconomy.cpp
index 378ab8ced1..f7442380b0 100644
--- a/indra/llinventory/lleconomy.cpp
+++ b/indra/llinventory/lleconomy.cpp
@@ -151,6 +151,11 @@ void LLRegionEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
 void LLRegionEconomy::processEconomyDataRequest(LLMessageSystem *msg, void **user_data)
 {
 	LLRegionEconomy *this_ptr = (LLRegionEconomy*)user_data;
+	if (!this_ptr->hasData())
+	{
+		llwarns << "Dropping EconomyDataRequest, because EconomyData message "
+				<< "has not been processed" << llendl;
+	}
 
 	msg->newMessageFast(_PREHASH_EconomyData);
 	msg->nextBlockFast(_PREHASH_Info);
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 94a90f2c20..6164dae22f 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1772,7 +1772,17 @@ LLPointer<LLInventoryItem> ll_create_item_from_sd(const LLSD& sd_item)
 	rv->rename(sd_item[INV_NAME_LABEL].asString());
 	rv->setType(
 		LLAssetType::lookup(sd_item[INV_ASSET_TYPE_LABEL].asString().c_str()));
-	rv->setAssetUUID(sd_item[INV_ASSET_ID_LABEL].asUUID());
+	if (sd_item.has("shadow_id"))
+	{
+		LLUUID asset_id = sd_item["shadow_id"];
+		LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
+		cipher.decrypt(asset_id.mData, UUID_BYTES);
+		rv->setAssetUUID(asset_id);
+	}
+	if (sd_item.has(INV_ASSET_ID_LABEL))
+	{
+		rv->setAssetUUID(sd_item[INV_ASSET_ID_LABEL].asUUID());
+	}
 	rv->setDescription(sd_item[INV_DESC_LABEL].asString());
 	rv->setSaleInfo(ll_sale_info_from_sd(sd_item[INV_SALE_INFO_LABEL]));
 	rv->setPermissions(ll_permissions_from_sd(sd_item[INV_PERMISSIONS_LABEL]));
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 42a9d64254..7ea83f6e5e 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -173,7 +173,6 @@ void LLParcel::init(const LLUUID &owner_id,
 	mRecordTransaction = FALSE;
 
 	mAuctionID = 0;
-	mIsReservedForNewbie = FALSE;
 	mInEscrow = false;
 
 	mParcelFlags = PF_DEFAULT;
@@ -633,10 +632,6 @@ BOOL LLParcel::importStream(std::istream& input_stream)
 		{
 			LLString::convertToU32(value, mAuctionID);
 		}
-		else if("reserved_newbie" == keyword)
-		{
-			LLString::convertToBOOL(value, mIsReservedForNewbie);
-		}
 		else if ("allow_modify" == keyword)
 		{
 			LLString::convertToU32(value, setting);
@@ -1071,10 +1066,6 @@ BOOL LLParcel::exportStream(std::ostream& output_stream)
 	{
 		output_stream << "\t\t auction_id       " << mAuctionID << "\n";
 	}
-	if(mIsReservedForNewbie)
-	{
-		output_stream << "\t\t reserved_newbie  " << mIsReservedForNewbie << "\n";
-	}
 
 	output_stream << "\t\t allow_modify     " << getAllowModify()  << "\n";
 	output_stream << "\t\t allow_group_modify     " << getAllowGroupModify()  << "\n";
@@ -1615,7 +1606,6 @@ void LLParcel::expireSale(U32& type, U8& flags, LLUUID& from_id, LLUUID& to_id)
 	setSellWithObjects(FALSE);
 	type = TRANS_LAND_RELEASE;
 	mStatus = OS_NONE;
-	mIsReservedForNewbie = FALSE;
 	flags = pack_transaction_flags(mGroupOwned, FALSE);
 	mAuthBuyerID.setNull();
 	from_id = mOwnerID;
@@ -1633,7 +1623,6 @@ void LLParcel::completeSale(U32& type, U8& flags,
 	flags = pack_transaction_flags(mGroupOwned, mGroupOwned);
 	to_id = mOwnerID;
 	mAuthBuyerID.setNull();
-	mIsReservedForNewbie = FALSE;
 
 	// Purchased parcels are assumed to no longer be for sale.
 	// Otherwise someone can snipe the sale.
@@ -1666,7 +1655,6 @@ void LLParcel::clearSale()
 	setPreviousOwnerID(LLUUID::null);
 	setPreviouslyGroupOwned(FALSE);
 	setSellWithObjects(FALSE);
-	mIsReservedForNewbie = FALSE;
 }
 
 BOOL LLParcel::isPublic() const
@@ -1700,7 +1688,6 @@ void LLParcel::clearParcel()
 	setUserLookAt(LLVector3::x_axis);
 	setLandingType(L_LANDING_POINT);
 	setAuctionID(0);
-	setReservedForNewbie(FALSE);
 	setGroupID(LLUUID::null);
 	setPassPrice(0);
 	setPassHours(0.f);
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 16d3cb01e5..131bcdd55d 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -190,7 +190,6 @@ public:
 	void setLandingType(const ELandingType type) { mLandingType = type; }
 
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
-	void setReservedForNewbie(BOOL reserve) { mIsReservedForNewbie = reserve; }
 
 	void	setAllParcelFlags(U32 flags) { mParcelFlags = flags; }
 	void	setParcelFlag(U32 flag, BOOL b);
@@ -271,7 +270,6 @@ public:
 	BOOL			getIsGroupOwned() const		{ return mGroupOwned; }
 
 	U32 getAuctionID() { return mAuctionID; }
-	BOOL getReservedForNewbie() { return mIsReservedForNewbie; }
 	bool isInEscrow() const { return mInEscrow; }
 
 	BOOL isPublic() const;
@@ -518,9 +516,6 @@ protected:
 	// the parcel.
 	U32 mAuctionID;
 
-	// This value is TRUE if the land is reserved for a newbie.
-	BOOL mIsReservedForNewbie;
-
 	// value used to temporarily lock attempts to purchase the parcel.
 	bool mInEscrow;