diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-28 10:13:34 -0500 |
| commit | 5374e544ed5888548bea334bd8ca7ca53372d031 (patch) | |
| tree | b73c80d7cdc6a78ad6caed46b9485f18b3f039a7 /indra/newview/llpreview.cpp | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
merge
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 119fc95cf0..18626e3273 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -363,8 +363,10 @@ void LLPreview::onBtnCopyToInv(void* userdata) // Copy to inventory if (self->mNotecardInventoryID.notNull()) { - copy_inventory_from_notecard(self->mNotecardObjectID, - self->mNotecardInventoryID, item); + copy_inventory_from_notecard(LLUUID::null, + self->mNotecardObjectID, + self->mNotecardInventoryID, + item); } else { |