aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewnotecard.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:56 -0500
committerJacek Antonelli2008-08-15 23:44:56 -0500
commitc07901e29ed545bbb02e3bddf148fe1104b94e9f (patch)
treef1ada64ce834acd7d92a425efb96c4b86bcf16b1 /linden/indra/newview/llpreviewnotecard.cpp
parentSecond Life viewer sources 1.15.0.2 (diff)
downloadmeta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.zip
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.gz
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.bz2
meta-impy-c07901e29ed545bbb02e3bddf148fe1104b94e9f.tar.xz
Second Life viewer sources 1.15.1.3
Diffstat (limited to 'linden/indra/newview/llpreviewnotecard.cpp')
-rw-r--r--linden/indra/newview/llpreviewnotecard.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 1c59bb4..471fe8a 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -296,11 +296,12 @@ void LLPreviewNotecard::loadAsset()
296 { 296 {
297 // The object that we're trying to look at disappeared, bail. 297 // The object that we're trying to look at disappeared, bail.
298 llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl; 298 llwarns << "Can't find object " << mObjectUUID << " associated with notecard." << llendl;
299 mAssetID.setNull(); 299 mAssetID.setNull();
300 editor->setText("Unable to find object containing this note."); 300 editor->setText("Unable to find object containing this note.");
301 editor->makePristine(); 301 editor->makePristine();
302 editor->setEnabled(FALSE); 302 editor->setEnabled(FALSE);
303 mAssetStatus = PREVIEW_ASSET_LOADED; 303 mAssetStatus = PREVIEW_ASSET_LOADED;
304 delete new_uuid;
304 return; 305 return;
305 } 306 }
306 } 307 }