Applied Kitty Barnett's patch for Search/Replace in notecards.

1 files changed, 21 insertions, 0 deletions

diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 6e7c6e3..f679a75 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -47,6 +47,9 @@
 #include "llviewerobjectlist.h"
 #include "lldbstrings.h"
 #include "llagent.h"
+#include "llfloatersearchreplace.h"
+#include "llpreviewnotecard.h"
+#include "llpreviewscript.h"
 #include "llvoavatar.h"
 #include "llselectmgr.h"
 #include "llinventoryview.h"
@@ -576,6 +579,24 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
         {
                 opened_preview->loadAsset();
         }
+
+        LLFloater* search_floater = LLFloaterSearchReplace::getInstance();
+        if ( (search_floater) && (search_floater->getDependee() == this) )
+        {
+                LLPreviewNotecard* notecard_preview; LLPreviewLSL* script_preview;
+                if ( (notecard_preview = dynamic_cast<LLPreviewNotecard*>(opened_preview)) != NULL )
+                {
+                        LLFloaterSearchReplace::show(notecard_preview->getEditor());
+                }
+                else if ( (script_preview = dynamic_cast<LLPreviewLSL*>(opened_preview)) != NULL )
+                {
+                        LLFloaterSearchReplace::show(script_preview->getEditor());
+                }
+                else
+                {
+                        search_floater->setVisible(FALSE);
+                }
+        }
 }
 
 //static