aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewnotecard.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-03-04 13:16:28 -0700
committerJacek Antonelli2010-03-11 19:03:52 -0600
commit1ddfb4c5dd436fc1a9a867d0a2b9980483a3d3fd (patch)
tree4ce9ece8150a60ab7292bd6cef3ff3c0dfcc4025 /linden/indra/newview/llpreviewnotecard.cpp
parentApplied UnknownJointsCrashFix v2 from Cool Viewer. (diff)
downloadmeta-impy-1ddfb4c5dd436fc1a9a867d0a2b9980483a3d3fd.zip
meta-impy-1ddfb4c5dd436fc1a9a867d0a2b9980483a3d3fd.tar.gz
meta-impy-1ddfb4c5dd436fc1a9a867d0a2b9980483a3d3fd.tar.bz2
meta-impy-1ddfb4c5dd436fc1a9a867d0a2b9980483a3d3fd.tar.xz
Applied Kitty Barnett's patch for Search/Replace in notecards.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpreviewnotecard.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 976023f..04f8004 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -40,6 +40,7 @@
40#include "llassetuploadresponders.h" 40#include "llassetuploadresponders.h"
41#include "llviewerwindow.h" 41#include "llviewerwindow.h"
42#include "llbutton.h" 42#include "llbutton.h"
43#include "llfloatersearchreplace.h"
43#include "llinventorymodel.h" 44#include "llinventorymodel.h"
44#include "lllineeditor.h" 45#include "lllineeditor.h"
45#include "llnotify.h" 46#include "llnotify.h"
@@ -213,6 +214,12 @@ BOOL LLPreviewNotecard::handleKeyHere(KEY key, MASK mask)
213 return TRUE; 214 return TRUE;
214 } 215 }
215 216
217 if(('F' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
218 {
219 LLFloaterSearchReplace::show(getChild<LLViewerTextEditor>("Notecard Editor"));
220 return TRUE;
221 }
222
216 return LLPreview::handleKeyHere(key, mask); 223 return LLPreview::handleKeyHere(key, mask);
217} 224}
218 225
@@ -647,4 +654,9 @@ void LLPreviewNotecard::reshape(S32 width, S32 height, BOOL called_from_parent)
647 } 654 }
648} 655}
649 656
657LLTextEditor* LLPreviewNotecard::getEditor()
658{
659 return getChild<LLViewerTextEditor>("Notecard Editor");
660}
661
650// EOF 662// EOF