svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 5cc2d2e39f..82974da634 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -157,6 +157,16 @@ void LLPreview::onCommit()
 	LLViewerInventoryItem* item = getItem();
 	if(item)
 	{
+		if (!item->isComplete())
+		{
+			// We are attempting to save an item that was never loaded
+			llwarns << "LLPreview::onCommit() called with mIsComplete == FALSE"
+					<< " Type: " << item->getType()
+					<< " ID: " << item->getUUID()
+					<< llendl;
+			return;
+		}
+		
 		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
 		BOOL has_sale_info = FALSE;
 		LLSaleInfo sale_info;