svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release

1 files changed, 6 insertions, 5 deletions

diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index a44a89dc19..1cba69b566 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -276,11 +276,12 @@ void LLPreviewNotecard::loadAsset()
 					{
 						// The object that we're trying to look at disappeared, bail.
 						llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl;
-			            mAssetID.setNull();
-			            editor->setText("Unable to find object containing this note.");
-			            editor->makePristine();
-			            editor->setEnabled(FALSE);
-			            mAssetStatus = PREVIEW_ASSET_LOADED;
+						mAssetID.setNull();
+						editor->setText("Unable to find object containing this note.");
+						editor->makePristine();
+						editor->setEnabled(FALSE);
+						mAssetStatus = PREVIEW_ASSET_LOADED;
+						delete new_uuid;
 						return;
 					}
 				}