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.cpp | |
| 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.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 01feff9b3c..aeffcd6c56 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -97,7 +97,7 @@ LLViewerInventoryItem::LLViewerInventoryItem() : LLViewerInventoryItem::LLViewerInventoryItem(const LLViewerInventoryItem* other) : LLInventoryItem() { - copy(other); + copyViewerItem(other); if (!mIsComplete) { llwarns << "LLViewerInventoryItem copy constructor for incomplete item" @@ -116,23 +116,22 @@ LLViewerInventoryItem::~LLViewerInventoryItem() { } -// virtual -void LLViewerInventoryItem::copy(const LLViewerInventoryItem* other) +void LLViewerInventoryItem::copyViewerItem(const LLViewerInventoryItem* other) { - LLInventoryItem::copy(other); + LLInventoryItem::copyItem(other); mIsComplete = other->mIsComplete; mTransactionID = other->mTransactionID; } -void LLViewerInventoryItem::copy(const LLInventoryItem *other) +// virtual +void LLViewerInventoryItem::copyItem(const LLInventoryItem *other) { - LLInventoryItem::copy(other); + LLInventoryItem::copyItem(other); mIsComplete = true; mTransactionID.setNull(); } -// virtual -void LLViewerInventoryItem::clone(LLPointer<LLViewerInventoryItem>& newitem) const +void LLViewerInventoryItem::cloneViewerItem(LLPointer<LLViewerInventoryItem>& newitem) const { newitem = new LLViewerInventoryItem(this); if(newitem.notNull()) @@ -348,17 +347,16 @@ LLViewerInventoryCategory::LLViewerInventoryCategory(const LLUUID& owner_id) : LLViewerInventoryCategory::LLViewerInventoryCategory(const LLViewerInventoryCategory* other) { - copy(other); + copyViewerCategory(other); } LLViewerInventoryCategory::~LLViewerInventoryCategory() { } -// virtual -void LLViewerInventoryCategory::copy(const LLViewerInventoryCategory* other) +void LLViewerInventoryCategory::copyViewerCategory(const LLViewerInventoryCategory* other) { - LLInventoryCategory::copy(other); + copyCategory(other); mOwnerID = other->mOwnerID; mVersion = other->mVersion; mDescendentCount = other->mDescendentCount; |