diff options
Diffstat (limited to 'linden/indra/llinventory/llinventory.h')
-rw-r--r-- | linden/indra/llinventory/llinventory.h | 8 |
1 files changed, 4 insertions, 4 deletions
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: | |||
85 | LLInventoryObject(const LLUUID& uuid, const LLUUID& parent_uuid, | 85 | LLInventoryObject(const LLUUID& uuid, const LLUUID& parent_uuid, |
86 | LLAssetType::EType type, const LLString& name); | 86 | LLAssetType::EType type, const LLString& name); |
87 | LLInventoryObject(); | 87 | LLInventoryObject(); |
88 | virtual void copy(const LLInventoryObject* other); // LLRefCount requires custom copy | 88 | void copyObject(const LLInventoryObject* other); // LLRefCount requires custom copy |
89 | 89 | ||
90 | // accessors | 90 | // accessors |
91 | const LLUUID& getUUID() const; | 91 | const LLUUID& getUUID() const; |
@@ -194,12 +194,12 @@ public: | |||
194 | // Note: Because InventoryItems are ref counted, reference copy (a = b) | 194 | // Note: Because InventoryItems are ref counted, reference copy (a = b) |
195 | // is prohibited | 195 | // is prohibited |
196 | LLInventoryItem(const LLInventoryItem* other); | 196 | LLInventoryItem(const LLInventoryItem* other); |
197 | virtual void copy(const LLInventoryItem* other); // LLRefCount requires custom copy | 197 | virtual void copyItem(const LLInventoryItem* other); // LLRefCount requires custom copy |
198 | 198 | ||
199 | // As a constructor alternative, the clone() method works like a | 199 | // As a constructor alternative, the clone() method works like a |
200 | // copy constructor, but gens a new UUID. | 200 | // copy constructor, but gens a new UUID. |
201 | // It is up to the caller to delete (unref) the item. | 201 | // It is up to the caller to delete (unref) the item. |
202 | virtual void clone(LLPointer<LLInventoryItem>& newitem) const; | 202 | virtual void cloneItem(LLPointer<LLInventoryItem>& newitem) const; |
203 | 203 | ||
204 | // accessors | 204 | // accessors |
205 | const LLPermissions& getPermissions() const; | 205 | const LLPermissions& getPermissions() const; |
@@ -278,7 +278,7 @@ public: | |||
278 | const LLString& name); | 278 | const LLString& name); |
279 | LLInventoryCategory(); | 279 | LLInventoryCategory(); |
280 | LLInventoryCategory(const LLInventoryCategory* other); | 280 | LLInventoryCategory(const LLInventoryCategory* other); |
281 | virtual void copy(const LLInventoryCategory* other); // LLRefCount requires custom copy | 281 | void copyCategory(const LLInventoryCategory* other); // LLRefCount requires custom copy |
282 | 282 | ||
283 | // accessors and mutators | 283 | // accessors and mutators |
284 | LLAssetType::EType getPreferredType() const; | 284 | LLAssetType::EType getPreferredType() const; |