diff options
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 64713108af..676943ff87 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -61,6 +61,7 @@ LLPreview::LLPreview(const LLSD& key) : LLFloater(key), mItemUUID(key.asUUID()), + mObjectUUID(), // set later by setObjectID() mCopyToInvBtn( NULL ), mForceClose(FALSE), mUserResized(FALSE), @@ -194,6 +195,13 @@ void LLPreview::changed(U32 mask) mDirty = TRUE; } +void LLPreview::setNotecardInfo(const LLUUID& notecard_inv_id, + const LLUUID& object_id) +{ + mNotecardInventoryID = notecard_inv_id; + mNotecardObjectID = object_id; +} + void LLPreview::draw() { LLFloater::draw(); @@ -338,6 +346,12 @@ void LLPreview::onOpen(const LLSD& key) } } +void LLPreview::setAuxItem( const LLInventoryItem* item ) +{ + if ( mAuxItem ) + mAuxItem->copyItem(item); +} + // static void LLPreview::onBtnCopyToInv(void* userdata) { @@ -349,7 +363,7 @@ void LLPreview::onBtnCopyToInv(void* userdata) // Copy to inventory if (self->mNotecardInventoryID.notNull()) { - copy_inventory_from_notecard(self->mObjectID, + copy_inventory_from_notecard(self->mNotecardObjectID, self->mNotecardInventoryID, item); } else |