svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 6 insertions, 4 deletions

diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 4ebfef3a9b..d81454fa8d 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -1433,12 +1433,14 @@ BOOL LLViewerTextEditor::exportBuffer( LLString& buffer )
 {
 	LLNotecard nc(LLNotecard::MAX_SIZE);
 
-	std::vector<LLPointer<LLInventoryItem> > embedded_items;
-	mEmbeddedItemList->getEmbeddedItemList(embedded_items);
-	
-	nc.setItems(embedded_items);
+	// Get the embedded text and update the item list to just be the used items
 	nc.setText(getEmbeddedText());
 
+	// Now get the used items and copy the list to the notecard
+	std::vector<LLPointer<LLInventoryItem> > embedded_items;
+	mEmbeddedItemList->getEmbeddedItemList(embedded_items);	
+	nc.setItems(embedded_items);
+	
 	std::stringstream out_stream;
 	nc.exportStream(out_stream);