23 files changed, 49 insertions, 25 deletions

diff --git a/linden/indra/llinventory/llcategory.cpp b/linden/indra/llinventory/llcategory.cpp
index e27733c..93f86f9 100644
--- a/linden/indra/llinventory/llcategory.cpp
+++ b/linden/indra/llinventory/llcategory.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llcategory.h b/linden/indra/llinventory/llcategory.h
index f566987..ed28a7f 100644
--- a/linden/indra/llinventory/llcategory.h
+++ b/linden/indra/llinventory/llcategory.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp
index 2337a3e..837acfe 100644
--- a/linden/indra/llinventory/lleconomy.cpp
+++ b/linden/indra/llinventory/lleconomy.cpp
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -170,6 +171,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/linden/indra/llinventory/lleconomy.h b/linden/indra/llinventory/lleconomy.h
index 7690142..b381663 100644
--- a/linden/indra/llinventory/lleconomy.h
+++ b/linden/indra/llinventory/lleconomy.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index c5be7f7..85fc47f 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
@@ -1101,7 +1102,7 @@ BOOL LLInventoryItem::exportLegacyStream(std::ostream& output_stream, BOOL inclu
         if(inv_type_str) 
                 output_stream << "\t\tinv_type\t" << inv_type_str << "\n";
         char buffer[32];        /* Flawfinder: ignore */
-        snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);  /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tflags\t%08x\n", mFlags);          /* Flawfinder: ignore */
         output_stream << buffer;
         mSaleInfo.exportLegacyStream(output_stream);
         output_stream << "\t\tname\t" << mName.c_str() << "|\n";
@@ -1791,7 +1792,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/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index fc135de..6e64412 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, 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
@@ -214,6 +215,10 @@ public:
                 II_FLAGS_OBJECT_PERM_OVERWRITE_EVERYONE         = 0x080000,
                 II_FLAGS_OBJECT_PERM_OVERWRITE_NEXT_OWNER       = 0x100000,
 
+                // flag to indicate whether an object that is returned is composed 
+                // of muiltiple items or not.
+                II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS                      = 0x200000,
+
                 // wearables use the low order byte of flags to store the
                 // EWearableType enumeration found in newview/llwearable.h
         };
diff --git a/linden/indra/llinventory/lllandmark.cpp b/linden/indra/llinventory/lllandmark.cpp
index c153d68..ae7a991 100644
--- a/linden/indra/llinventory/lllandmark.cpp
+++ b/linden/indra/llinventory/lllandmark.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/lllandmark.h b/linden/indra/llinventory/lllandmark.h
index eea0600..69c377a 100644
--- a/linden/indra/llinventory/lllandmark.h
+++ b/linden/indra/llinventory/lllandmark.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llnotecard.cpp b/linden/indra/llinventory/llnotecard.cpp
index d40cabb..47dd690 100644
--- a/linden/indra/llinventory/llnotecard.cpp
+++ b/linden/indra/llinventory/llnotecard.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2006-2007, 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
diff --git a/linden/indra/llinventory/llnotecard.h b/linden/indra/llinventory/llnotecard.h
index 511d779..3d89c7a 100644
--- a/linden/indra/llinventory/llnotecard.h
+++ b/linden/indra/llinventory/llnotecard.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2006-2007, 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
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index b4faf7c..c37a4d6 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -192,7 +193,6 @@ void LLParcel::init(const LLUUID &owner_id,
         mRecordTransaction = FALSE;
 
         mAuctionID = 0;
-        mIsReservedForNewbie = FALSE;
         mInEscrow = false;
 
         mParcelFlags = PF_DEFAULT;
@@ -652,10 +652,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);
@@ -1090,10 +1086,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";
@@ -1634,7 +1626,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;
@@ -1652,7 +1643,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.
@@ -1685,7 +1675,6 @@ void LLParcel::clearSale()
         setPreviousOwnerID(LLUUID::null);
         setPreviouslyGroupOwned(FALSE);
         setSellWithObjects(FALSE);
-        mIsReservedForNewbie = FALSE;
 }
 
 BOOL LLParcel::isPublic() const
@@ -1719,7 +1708,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/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 54936e2..29e393a 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -209,7 +210,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);
@@ -290,7 +290,6 @@ public:
         BOOL                    getIsGroupOwned() const         { return mGroupOwned; }
 
         U32 getAuctionID() { return mAuctionID; }
-        BOOL getReservedForNewbie() { return mIsReservedForNewbie; }
         bool isInEscrow() const { return mInEscrow; }
 
         BOOL isPublic() const;
@@ -537,9 +536,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;
 
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 66158d8..17d9151 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index 0788ec6..86ab57c 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2002-2007, 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
@@ -757,15 +758,15 @@ BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
         output_stream <<  "\t{\n";
 
         char buffer[256];       /* Flawfinder: ignore */
-        snprintf(buffer, sizeof(buffer), "\t\tbase_mask\t%08x\n",               mMaskBase);     /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tbase_mask\t%08x\n",               mMaskBase);             /* Flawfinder: ignore */
         output_stream << buffer;
-        snprintf(buffer, sizeof(buffer), "\t\towner_mask\t%08x\n",              mMaskOwner);    /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\towner_mask\t%08x\n",              mMaskOwner);            /* Flawfinder: ignore */
         output_stream << buffer;
-        snprintf(buffer, sizeof(buffer), "\t\tgroup_mask\t%08x\n",              mMaskGroup);    /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tgroup_mask\t%08x\n",              mMaskGroup);            /* Flawfinder: ignore */
         output_stream << buffer;
-        snprintf(buffer, sizeof(buffer), "\t\teveryone_mask\t%08x\n",   mMaskEveryone); /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\teveryone_mask\t%08x\n",   mMaskEveryone);         /* Flawfinder: ignore */
         output_stream << buffer;
-        snprintf(buffer, sizeof(buffer), "\t\tnext_owner_mask\t%08x\n", mMaskNextOwner);        /* Flawfinder: ignore */
+        snprintf(buffer, sizeof(buffer), "\t\tnext_owner_mask\t%08x\n", mMaskNextOwner);                /* Flawfinder: ignore */
         output_stream << buffer;
 
         mCreator.toString(uuid_str);
diff --git a/linden/indra/llinventory/llpermissions.h b/linden/indra/llinventory/llpermissions.h
index d8a6b0a..608f4b2 100644
--- a/linden/indra/llinventory/llpermissions.h
+++ b/linden/indra/llinventory/llpermissions.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llpermissionsflags.h b/linden/indra/llinventory/llpermissionsflags.h
index 2af16fb..72778be 100644
--- a/linden/indra/llinventory/llpermissionsflags.h
+++ b/linden/indra/llinventory/llpermissionsflags.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 28801e5..9364529 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/llsaleinfo.h b/linden/indra/llinventory/llsaleinfo.h
index 5e80108..fd6429e 100644
--- a/linden/indra/llinventory/llsaleinfo.h
+++ b/linden/indra/llinventory/llsaleinfo.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, 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
diff --git a/linden/indra/llinventory/lltransactionflags.cpp b/linden/indra/llinventory/lltransactionflags.cpp
index 16d6101..ffd3271 100644
--- a/linden/indra/llinventory/lltransactionflags.cpp
+++ b/linden/indra/llinventory/lltransactionflags.cpp
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2003-2007, 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
diff --git a/linden/indra/llinventory/lltransactionflags.h b/linden/indra/llinventory/lltransactionflags.h
index ed47995..3675074 100644
--- a/linden/indra/llinventory/lltransactionflags.h
+++ b/linden/indra/llinventory/lltransactionflags.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2003-2007, 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
diff --git a/linden/indra/llinventory/lltransactiontypes.h b/linden/indra/llinventory/lltransactiontypes.h
index 345fe89..49ba6aa 100644
--- a/linden/indra/llinventory/lltransactiontypes.h
+++ b/linden/indra/llinventory/lltransactiontypes.h
@@ -3,6 +3,7 @@
  *
  * Copyright (c) 2003-2007, 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
diff --git a/linden/indra/llinventory/lluserrelations.cpp b/linden/indra/llinventory/lluserrelations.cpp
index e9248c3..fc8e510 100644
--- a/linden/indra/llinventory/lluserrelations.cpp
+++ b/linden/indra/llinventory/lluserrelations.cpp
@@ -6,6 +6,7 @@
  *
  * Copyright (c) 2006-2007, 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
diff --git a/linden/indra/llinventory/lluserrelations.h b/linden/indra/llinventory/lluserrelations.h
index 9363ab5..430dc43 100644
--- a/linden/indra/llinventory/lluserrelations.h
+++ b/linden/indra/llinventory/lluserrelations.h
@@ -6,6 +6,7 @@
  *
  * Copyright (c) 2006-2007, 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