diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llviewerinventory.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 102239099f..42dd91f916 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -58,8 +58,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, time_t creation_date_utc); @@ -69,7 +69,7 @@ public: LLViewerInventoryItem( const LLUUID& item_id, const LLUUID& parent_id, - const char* name, + const std::string& name, LLInventoryType::EType inv_type); // construct an invalid and incomplete viewer inventory item. @@ -149,7 +149,7 @@ protected: public: LLViewerInventoryCategory(const LLUUID& uuid, const LLUUID& parent_uuid, LLAssetType::EType preferred_type, - const LLString& name, + const std::string& name, const LLUUID& owner_id); LLViewerInventoryCategory(const LLUUID& owner_id); // Create a copy of an inventory category from a pointer to another category @@ -161,7 +161,6 @@ public: virtual void removeFromServer(); virtual void updateParentOnServer(BOOL restamp_children) const; virtual void updateServer(BOOL is_new) const; - //virtual BOOL unpackMessage(LLMessageSystem* msg, const char* block, S32 block_num = 0); const LLUUID& getOwnerID() const { return mOwnerID; } |