Second Life viewer sources 1.19.1.2

2 files changed, 13 insertions, 13 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index e6c1175..3afa2be 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -99,7 +99,7 @@ LLInventoryObject::~LLInventoryObject( void )
 {
 }
 
-void LLInventoryObject::copy(const LLInventoryObject* other)
+void LLInventoryObject::copyObject(const LLInventoryObject* other)
 {
         mUUID = other->mUUID;
         mParentUUID = other->mParentUUID;
@@ -309,7 +309,7 @@ LLInventoryItem::LLInventoryItem() :
 LLInventoryItem::LLInventoryItem(const LLInventoryItem* other) :
         LLInventoryObject()
 {
-        copy(other);
+        copyItem(other);
 }
 
 LLInventoryItem::~LLInventoryItem()
@@ -317,9 +317,9 @@ LLInventoryItem::~LLInventoryItem()
 }
 
 // virtual
-void LLInventoryItem::copy(const LLInventoryItem* other)
+void LLInventoryItem::copyItem(const LLInventoryItem* other)
 {
-        LLInventoryObject::copy(other);
+        copyObject(other);
         mPermissions = other->mPermissions;
         mAssetUUID = other->mAssetUUID;
         mDescription = other->mDescription;
@@ -331,10 +331,10 @@ void LLInventoryItem::copy(const LLInventoryItem* other)
 
 // As a constructor alternative, the clone() method works like a
 // copy constructor, but gens a new UUID.
-void LLInventoryItem::clone(LLPointer<LLInventoryItem>& newitem) const
+void LLInventoryItem::cloneItem(LLPointer<LLInventoryItem>& newitem) const
 {
         newitem = new LLInventoryItem;
-        newitem->copy(this);
+        newitem->copyItem(this);
         newitem->mUUID.generate();
 }
 
@@ -1334,7 +1334,7 @@ LLInventoryCategory::LLInventoryCategory() :
 LLInventoryCategory::LLInventoryCategory(const LLInventoryCategory* other) :
         LLInventoryObject()
 {
-        copy(other);
+        copyCategory(other);
 }
 
 LLInventoryCategory::~LLInventoryCategory()
@@ -1342,9 +1342,9 @@ LLInventoryCategory::~LLInventoryCategory()
 }
 
 // virtual
-void LLInventoryCategory::copy(const LLInventoryCategory* other)
+void LLInventoryCategory::copyCategory(const LLInventoryCategory* other)
 {
-        LLInventoryObject::copy(other);
+        copyObject(other);
         mPreferredType = other->mPreferredType;
 }
 
diff --git a/linden/indra/llinventory/llinventory.h b/linden/indra/llinventory/llinventory.h
index 3662d63..1623edf 100644
--- a/linden/indra/llinventory/llinventory.h
+++ b/linden/indra/llinventory/llinventory.h
@@ -85,7 +85,7 @@ public:
         LLInventoryObject(const LLUUID& uuid, const LLUUID& parent_uuid,
                                           LLAssetType::EType type, const LLString& name);
         LLInventoryObject();
-        virtual void copy(const LLInventoryObject* other); // LLRefCount requires custom copy
+        void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy
 
         // accessors
         const LLUUID& getUUID() const;
@@ -194,12 +194,12 @@ public:
         // Note: Because InventoryItems are ref counted, reference copy (a = b)
         // is prohibited
         LLInventoryItem(const LLInventoryItem* other);
-        virtual void copy(const LLInventoryItem* other); // LLRefCount requires custom copy
+        virtual void copyItem(const LLInventoryItem* other); // LLRefCount requires custom copy
 
         // As a constructor alternative, the clone() method works like a
         // copy constructor, but gens a new UUID.
         // It is up to the caller to delete (unref) the item.
-        virtual void clone(LLPointer<LLInventoryItem>& newitem) const;
+        virtual void cloneItem(LLPointer<LLInventoryItem>& newitem) const;
         
         // accessors
         const LLPermissions& getPermissions() const;
@@ -278,7 +278,7 @@ public:
                                                 const LLString& name);
         LLInventoryCategory();
         LLInventoryCategory(const LLInventoryCategory* other);
-        virtual void copy(const LLInventoryCategory* other); // LLRefCount requires custom copy
+        void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy
 
         // accessors and mutators
         LLAssetType::EType getPreferredType() const;