diff options
Diffstat (limited to 'linden/indra/newview/llviewerinventory.h')
-rw-r--r-- | linden/indra/newview/llviewerinventory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewerinventory.h b/linden/indra/newview/llviewerinventory.h index 016f7c8..05dc19a 100644 --- a/linden/indra/newview/llviewerinventory.h +++ b/linden/indra/newview/llviewerinventory.h | |||
@@ -83,13 +83,13 @@ public: | |||
83 | LLViewerInventoryItem(const LLViewerInventoryItem* other); | 83 | LLViewerInventoryItem(const LLViewerInventoryItem* other); |
84 | LLViewerInventoryItem(const LLInventoryItem* other); | 84 | LLViewerInventoryItem(const LLInventoryItem* other); |
85 | 85 | ||
86 | virtual void copy(const LLViewerInventoryItem* other); | 86 | void copyViewerItem(const LLViewerInventoryItem* other); |
87 | virtual void copy(const LLInventoryItem* other); | 87 | /*virtual*/ void copyItem(const LLInventoryItem* other); |
88 | 88 | ||
89 | // construct a new clone of this item - it creates a new viewer | 89 | // construct a new clone of this item - it creates a new viewer |
90 | // inventory item using the copy constructor, and returns it. | 90 | // inventory item using the copy constructor, and returns it. |
91 | // It is up to the caller to delete (unref) the item. | 91 | // It is up to the caller to delete (unref) the item. |
92 | virtual void clone(LLPointer<LLViewerInventoryItem>& newitem) const; | 92 | void cloneViewerItem(LLPointer<LLViewerInventoryItem>& newitem) const; |
93 | 93 | ||
94 | // virtual methods | 94 | // virtual methods |
95 | virtual void removeFromServer( void ); | 95 | virtual void removeFromServer( void ); |
@@ -156,7 +156,7 @@ public: | |||
156 | // Note: Because InventoryCategorys are ref counted, reference copy (a = b) | 156 | // Note: Because InventoryCategorys are ref counted, reference copy (a = b) |
157 | // is prohibited | 157 | // is prohibited |
158 | LLViewerInventoryCategory(const LLViewerInventoryCategory* other); | 158 | LLViewerInventoryCategory(const LLViewerInventoryCategory* other); |
159 | virtual void copy(const LLViewerInventoryCategory* other); | 159 | void copyViewerCategory(const LLViewerInventoryCategory* other); |
160 | 160 | ||
161 | virtual void removeFromServer(); | 161 | virtual void removeFromServer(); |
162 | virtual void updateParentOnServer(BOOL restamp_children) const; | 162 | virtual void updateParentOnServer(BOOL restamp_children) const; |