diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-03 19:21:14 +0000 |
| commit | b5936a4b1d8780b5b8cd425998eacd2c64ffa693 (patch) | |
| tree | c1581bcf34e96a897c6e1d9a4aed95f353713baa /indra/newview/llviewerinventory.h | |
| parent | 55c25229b79b1755c989e5996c8e8d118f369721 (diff) | |
1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rw-r--r-- | indra/newview/llviewerinventory.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index bf49a1604f..24c33bf292 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -83,13 +83,13 @@ public: LLViewerInventoryItem(const LLViewerInventoryItem* other); LLViewerInventoryItem(const LLInventoryItem* other); - virtual void copy(const LLViewerInventoryItem* other); - virtual void copy(const LLInventoryItem* other); + void copyViewerItem(const LLViewerInventoryItem* other); + /*virtual*/ void copyItem(const LLInventoryItem* other); // construct a new clone of this item - it creates a new viewer // inventory item using the copy constructor, and returns it. // It is up to the caller to delete (unref) the item. - virtual void clone(LLPointer<LLViewerInventoryItem>& newitem) const; + void cloneViewerItem(LLPointer<LLViewerInventoryItem>& newitem) const; // virtual methods virtual void removeFromServer( void ); @@ -156,7 +156,7 @@ public: // Note: Because InventoryCategorys are ref counted, reference copy (a = b) // is prohibited LLViewerInventoryCategory(const LLViewerInventoryCategory* other); - virtual void copy(const LLViewerInventoryCategory* other); + void copyViewerCategory(const LLViewerInventoryCategory* other); virtual void removeFromServer(); virtual void updateParentOnServer(BOOL restamp_children) const; |