From facf67ae3226105910c983a8fa8760414bf703e9 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 5 Dec 2007 23:43:56 +0000
Subject: EFFECTIVE MERGE: svn merge -r 71520:73420
svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE:
svn merge -r 75074:75114
svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
---
indra/newview/llpreviewnotecard.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'indra/newview/llpreviewnotecard.h')
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index 9909284d5f..233246ceaa 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -54,7 +54,8 @@ public:
const LLUUID& asset_id = LLUUID::null,
BOOL show_keep_discard = FALSE,
LLPointer<LLViewerInventoryItem> inv_item = NULL);
-
+ virtual ~LLPreviewNotecard();
+
// llpreview
virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr);
@@ -102,6 +103,8 @@ protected:
static void handleSaveChangesDialog(S32 option, void* userdata);
+ virtual const char *getTitleName() const { return "Note"; }
+
protected:
LLViewerTextEditor* mEditor;
LLButton* mSaveBtn;
--
cgit v1.2.3