Second Life viewer sources 1.21.0-RC

1 files changed, 13 insertions, 13 deletions

diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 1bb6b85..d3cce6b 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -75,7 +75,7 @@ protected:
         LLUUID mUUID;
         LLUUID mParentUUID;
         LLAssetType::EType mType;
-        LLString mName;
+        std::string mName;
 
 protected:
         virtual ~LLInventoryObject( void );
@@ -83,19 +83,19 @@ protected:
 public:
         MEM_TYPE_NEW(LLMemType::MTYPE_INVENTORY);
         LLInventoryObject(const LLUUID& uuid, const LLUUID& parent_uuid,
-                                          LLAssetType::EType type, const LLString& name);
+                                          LLAssetType::EType type, const std::string& name);
         LLInventoryObject();
         void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy
 
         // accessors
         const LLUUID& getUUID() const;
         const LLUUID& getParentUUID() const;
-        const LLString& getName() const;
+        const std::string& getName() const;
         LLAssetType::EType getType() const;
 
         // mutators - will not call updateServer();
         void setUUID(const LLUUID& new_uuid);
-        void rename(const LLString& new_name);
+        void rename(const std::string& new_name);
         void setParent(const LLUUID& new_parent);
         void setType(LLAssetType::EType type);
 
@@ -128,11 +128,11 @@ public:
 protected:
         LLPermissions mPermissions;
         LLUUID mAssetUUID;
-        LLString mDescription;
+        std::string mDescription;
         LLSaleInfo mSaleInfo;
         LLInventoryType::EType mInventoryType;
         U32 mFlags;
-        S32 mCreationDate;      // seconds from 1/1/1970, UTC
+        time_t mCreationDate;   // seconds from 1/1/1970, UTC
 
 public:
 
@@ -212,8 +212,8 @@ public:
                                         const LLUUID& asset_uuid,
                                         LLAssetType::EType type,
                                         LLInventoryType::EType inv_type,
-                                        const LLString& name, 
-                                        const LLString& desc,
+                                        const std::string& name, 
+                                        const std::string& desc,
                                         const LLSaleInfo& sale_info,
                                         U32 flags,
                                         S32 creation_date_utc);
@@ -233,22 +233,22 @@ public:
         const LLPermissions& getPermissions() const;
         const LLUUID& getCreatorUUID() const;
         const LLUUID& getAssetUUID() const;
-        const LLString& getDescription() const;
+        const std::string& getDescription() const;
         const LLSaleInfo& getSaleInfo() const;
         LLInventoryType::EType getInventoryType() const;
         U32 getFlags() const;
-        S32 getCreationDate() const;
+        time_t getCreationDate() const;
         U32 getCRC32() const; // really more of a checksum.
         
         // mutators - will not call updateServer(), and will never fail
         // (though it may correct to sane values)
         void setAssetUUID(const LLUUID& asset_id);
-        void setDescription(const LLString& new_desc);
+        void setDescription(const std::string& new_desc);
         void setSaleInfo(const LLSaleInfo& sale_info);
         void setPermissions(const LLPermissions& perm);
         void setInventoryType(LLInventoryType::EType inv_type);
         void setFlags(U32 flags);
-        void setCreationDate(S32 creation_date_utc);
+        void setCreationDate(time_t creation_date_utc);
 
         // Put this inventory item onto the current outgoing mesage. It
         // assumes you have already called nextBlock().
@@ -303,7 +303,7 @@ public:
         MEM_TYPE_NEW(LLMemType::MTYPE_INVENTORY);
         LLInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid,
                                                 LLAssetType::EType preferred_type,
-                                                const LLString& name);
+                                                const std::string& name);
         LLInventoryCategory();
         LLInventoryCategory(const LLInventoryCategory* other);
         void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy