Second Life viewer sources 1.20.2

6 files changed, 59 insertions, 28 deletions

diff --git a/linden/indra/llinventory/lleconomy.cpp b/linden/indra/llinventory/lleconomy.cpp
index 6ed0510..619c5f9 100644
--- a/linden/indra/llinventory/lleconomy.cpp
+++ b/linden/indra/llinventory/lleconomy.cpp
@@ -35,7 +35,6 @@
 #include "message.h"
 #include "v3math.h"
 
-LLGlobalEconomy *gGlobalEconomy = NULL;
 
 LLGlobalEconomy::LLGlobalEconomy()
 :       mObjectCount( -1 ),
@@ -55,35 +54,33 @@ LLGlobalEconomy::~LLGlobalEconomy()
 { }
 
 // static
-void LLGlobalEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
+void LLGlobalEconomy::processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data)
 {
         S32 i;
         F32 f;
 
-        LLGlobalEconomy *this_ptr = (LLGlobalEconomy*)user_data;
-
         msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCapacity, i);
-        this_ptr->setObjectCapacity(i);
+        econ_data->setObjectCapacity(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_ObjectCount, i);
-        this_ptr->setObjectCount(i);
+        econ_data->setObjectCount(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceEnergyUnit, i);
-        this_ptr->setPriceEnergyUnit(i);
+        econ_data->setPriceEnergyUnit(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceObjectClaim, i);
-        this_ptr->setPriceObjectClaim(i);
+        econ_data->setPriceObjectClaim(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDecay, i);
-        this_ptr->setPricePublicObjectDecay(i);
+        econ_data->setPricePublicObjectDecay(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PricePublicObjectDelete, i);
-        this_ptr->setPricePublicObjectDelete(i);
+        econ_data->setPricePublicObjectDelete(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceUpload, i);
-        this_ptr->setPriceUpload(i);
+        econ_data->setPriceUpload(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceRentLight, i);
-        this_ptr->setPriceRentLight(i);
+        econ_data->setPriceRentLight(i);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_TeleportMinPrice, i);
-        this_ptr->setTeleportMinPrice(i);
+        econ_data->setTeleportMinPrice(i);
         msg->getF32Fast(_PREHASH_Info, _PREHASH_TeleportPriceExponent, f);
-        this_ptr->setTeleportPriceExponent(f);
+        econ_data->setTeleportPriceExponent(f);
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceGroupCreate, i);
-        this_ptr->setPriceGroupCreate(i);
+        econ_data->setPriceGroupCreate(i);
 }
 
 S32     LLGlobalEconomy::calculateTeleportCost(F32 distance) const
@@ -154,10 +151,10 @@ void LLRegionEconomy::processEconomyData(LLMessageSystem *msg, void** user_data)
         S32 i;
         F32 f;
 
-        LLGlobalEconomy::processEconomyData(msg, user_data);
-
         LLRegionEconomy *this_ptr = (LLRegionEconomy*)user_data;
 
+        LLGlobalEconomy::processEconomyData(msg, this_ptr);
+
         msg->getS32Fast(_PREHASH_Info, _PREHASH_PriceParcelClaim, i);
         this_ptr->setBasePriceParcelClaimDefault(i);
         msg->getF32(_PREHASH_Info, _PREHASH_PriceParcelClaimFactor, f);
diff --git a/linden/indra/llinventory/lleconomy.h b/linden/indra/llinventory/lleconomy.h
index c5caa42..dcc97b2 100644
--- a/linden/indra/llinventory/lleconomy.h
+++ b/linden/indra/llinventory/lleconomy.h
@@ -31,6 +31,8 @@
 #ifndef LL_LLECONOMY_H
 #define LL_LLECONOMY_H
 
+#include "llmemory.h"
+
 class LLMessageSystem;
 class LLVector3;
 
@@ -40,9 +42,14 @@ public:
         LLGlobalEconomy();
         virtual ~LLGlobalEconomy();
 
+        // This class defines its singleton internally as a typedef instead of inheriting from
+        // LLSingleton like most others because the LLRegionEconomy sub-class might also
+        // become a singleton and this pattern will more easily disambiguate them.
+        typedef LLSingleton<LLGlobalEconomy> Singleton;
+
         virtual void print();
 
-        static void processEconomyData(LLMessageSystem *msg, void **user_data);
+        static void processEconomyData(LLMessageSystem *msg, LLGlobalEconomy* econ_data);
 
         S32             calculateTeleportCost(F32 distance) const;
         S32             calculateLightRent(const LLVector3& object_size) const;
@@ -136,6 +143,4 @@ private:
 
 };
 
-extern LLGlobalEconomy* gGlobalEconomy;
-
 #endif
diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 3afa2be..4c58789 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -940,6 +940,7 @@ LLSD LLInventoryItem::asLLSD() const
         }
         else
         {
+                // *TODO: get rid of this. Phoenix 2008-01-30
                 LLUUID shadow_id(mAssetUUID);
                 LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
                 cipher.encrypt(shadow_id.mData, UUID_BYTES);
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1623edf..b4199db 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -135,15 +135,40 @@ protected:
         S32 mCreationDate;      // seconds from 1/1/1970, UTC
 
 public:
+
+        /**
+         * Anonymous enumeration for specifying the inventory item flags.
+         */
         enum
         {
-                // The meaning of LLInventoryItem::mFlags is distinct for each
-                // inventory type.
+                // The shared flags at the top are shared among all inventory
+                // types. After that section, all values of flags are type
+                // dependent.  The shared flags will start at 2^30 and work
+                // down while item type specific flags will start at 2^0 and
+                // work up.
                 II_FLAGS_NONE = 0,
 
-                // landmark flags
+
+                //
+                // Shared flags
+                //
+                //
+
+                // This value means that the asset has only one reference in
+                // the system. If the inventory item is deleted, or the asset
+                // id updated, then we can remove the old reference.
+                II_FLAGS_SHARED_SINGLE_REFERENCE = 0x40000000,
+
+
+                //
+                // Landmark flags
+                //
                 II_FLAGS_LANDMARK_VISITED = 1,
 
+                //
+                // Object flags
+                //
+
                 // flag to indicate that object permissions should have next
                 // owner perm be more restrictive on rez. We bump this into
                 // the second byte of the flags since the low byte is used to
@@ -169,8 +194,11 @@ public:
                 // 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
+                //
+                II_FLAGS_WEARABLES_MASK = 0xff,
         };
 
 protected:
diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 5f8a000..1390f72 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -216,8 +216,8 @@ void LLParcel::init(const LLUUID &owner_id,
         mMediaID.setNull();
         mMediaAutoScale = 0;
         mMediaLoop = TRUE;
-        mObscureMedia = 0;
-        mObscureMusic = 0;
+        mObscureMedia = 1;
+        mObscureMusic = 1;
         mMediaWidth = 0;
         mMediaHeight = 0;
 
@@ -1856,8 +1856,8 @@ void LLParcel::clearParcel()
     setMediaDesc(NULL);
         setMediaAutoScale(0);
         setMediaLoop(TRUE);
-        mObscureMedia = 0;
-        mObscureMusic = 0;
+        mObscureMedia = 1;
+        mObscureMusic = 1;
         mMediaWidth = 0;
         mMediaHeight = 0;
         setMusicURL(NULL);
diff --git a/linden/indra/llinventory/llparcelflags.h b/linden/indra/llinventory/llparcelflags.h
index 1bf744b..62a6acf 100644
--- a/linden/indra/llinventory/llparcelflags.h
+++ b/linden/indra/llinventory/llparcelflags.h
@@ -81,7 +81,7 @@ const U32 PF_USE_RESTRICTED_ACCESS = PF_USE_ACCESS_GROUP
                                                                                 | PF_DENY_ANONYMOUS
                                                                                 | PF_DENY_AGEUNVERIFIED;
 const U32 PF_NONE = 0x00000000;
-const U32 PF_ALL  = 0x7FFFFFFF;
+const U32 PF_ALL  = 0xFFFFFFFF;
 const U32 PF_DEFAULT =  PF_ALLOW_FLY
                                                 | PF_ALLOW_OTHER_SCRIPTS
                                                 | PF_ALLOW_GROUP_SCRIPTS