1 files changed, 13 insertions, 152 deletions

diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 2718c2f..9369a3a 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -76,6 +76,7 @@
 #include "lldir.h"
 #include "llcombobox.h"
 //#include "llfloaterchat.h"
+#include "llfloatersearchreplace.h"
 #include "llviewerstats.h"
 #include "llviewertexteditor.h"
 #include "llviewerwindow.h"
@@ -147,147 +148,6 @@ static bool have_script_upload_cap(LLUUID& object_id)
 }
 
 /// ---------------------------------------------------------------------------
-/// LLFloaterScriptSearch
-/// ---------------------------------------------------------------------------
-class LLFloaterScriptSearch : public LLFloater
-{
-public:
-        LLFloaterScriptSearch(std::string title, LLRect rect, LLScriptEdCore* editor_core);
-        ~LLFloaterScriptSearch();
-
-        static void show(LLScriptEdCore* editor_core);
-        static void onBtnSearch(void* userdata);
-        void handleBtnSearch();
-
-        static void onBtnReplace(void* userdata);
-        void handleBtnReplace();
-
-        static void onBtnReplaceAll(void* userdata);
-        void handleBtnReplaceAll();
-
-        LLScriptEdCore* getEditorCore() { return mEditorCore; }
-        static LLFloaterScriptSearch* getInstance() { return sInstance; }
-
-        void open();            /*Flawfinder: ignore*/
-
-private:
-
-        LLScriptEdCore* mEditorCore;
-
-        static LLFloaterScriptSearch*   sInstance;
-};
-
-LLFloaterScriptSearch* LLFloaterScriptSearch::sInstance = NULL;
-
-LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLScriptEdCore* editor_core)
-        : LLFloater("script     search",rect,title), mEditorCore(editor_core)
-{
-        
-        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_search.xml");
-
-        childSetAction("search_btn", onBtnSearch,this);
-        childSetAction("replace_btn", onBtnReplace,this);
-        childSetAction("replace_all_btn", onBtnReplaceAll,this);
-        
-        setDefaultBtn("search_btn");
-
-        if (!getHost())
-        {
-                LLRect curRect = getRect();
-                translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
-        }
-        
-        sInstance = this;
-
-        childSetFocus("search_text", TRUE);
-
-        // find floater in which script panel is embedded
-        LLView* viewp = (LLView*)editor_core;
-        while(viewp)
-        {
-                LLFloater* floaterp = dynamic_cast<LLFloater*>(viewp);
-                if (floaterp)
-                {
-                        floaterp->addDependentFloater(this);
-                        break;
-                }
-                viewp = viewp->getParent();
-        }
-}
-
-//static 
-void LLFloaterScriptSearch::show(LLScriptEdCore* editor_core)
-{
-        if (sInstance && sInstance->mEditorCore && sInstance->mEditorCore != editor_core)
-        {
-                sInstance->close();
-                delete sInstance;
-        }
-
-        if (!sInstance)
-        {
-                S32 left = 0;
-                S32 top = 0;
-                gFloaterView->getNewFloaterPosition(&left,&top);
-
-                // sInstance will be assigned in the constructor.
-                new LLFloaterScriptSearch("Script Search",LLRect(left,top,left + SCRIPT_SEARCH_WIDTH,top - SCRIPT_SEARCH_HEIGHT),editor_core);
-        }
-
-        sInstance->open();              /*Flawfinder: ignore*/
-}
-
-LLFloaterScriptSearch::~LLFloaterScriptSearch()
-{
-        sInstance = NULL;
-}
-
-// static 
-void LLFloaterScriptSearch::onBtnSearch(void *userdata)
-{
-        LLFloaterScriptSearch* self = (LLFloaterScriptSearch*)userdata;
-        self->handleBtnSearch();
-}
-
-void LLFloaterScriptSearch::handleBtnSearch()
-{
-        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
-        mEditorCore->mEditor->selectNext(childGetText("search_text"), caseChk->get());
-}
-
-// static 
-void LLFloaterScriptSearch::onBtnReplace(void *userdata)
-{
-        LLFloaterScriptSearch* self = (LLFloaterScriptSearch*)userdata;
-        self->handleBtnReplace();
-}
-
-void LLFloaterScriptSearch::handleBtnReplace()
-{
-        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
-        mEditorCore->mEditor->replaceText(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
-}
-
-// static 
-void LLFloaterScriptSearch::onBtnReplaceAll(void *userdata)
-{
-        LLFloaterScriptSearch* self = (LLFloaterScriptSearch*)userdata;
-        self->handleBtnReplaceAll();
-}
-
-void LLFloaterScriptSearch::handleBtnReplaceAll()
-{
-        LLCheckBoxCtrl* caseChk = getChild<LLCheckBoxCtrl>("case_text");
-        mEditorCore->mEditor->replaceTextAll(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
-}
-
-void LLFloaterScriptSearch::open()              /*Flawfinder: ignore*/
-{
-        LLFloater::open();              /*Flawfinder: ignore*/
-        childSetFocus("search_text", TRUE); 
-}
-
-/// ---------------------------------------------------------------------------
 /// LLScriptEdCore
 /// ---------------------------------------------------------------------------
 
@@ -385,14 +245,6 @@ LLScriptEdCore::LLScriptEdCore(
 LLScriptEdCore::~LLScriptEdCore()
 {
         deleteBridges();
-
-        // If the search window is up for this editor, close it.
-        LLFloaterScriptSearch* script_search = LLFloaterScriptSearch::getInstance();
-        if (script_search && script_search->getEditorCore() == this)
-        {
-                script_search->close();
-                delete script_search;
-        }
 }
 
 void LLScriptEdCore::initMenu()
@@ -931,7 +783,10 @@ void LLScriptEdCore::onBtnLoadFromDisc( void* data )
 void LLScriptEdCore::onSearchMenu(void* userdata)
 {
         LLScriptEdCore* sec = (LLScriptEdCore*)userdata;
-        LLFloaterScriptSearch::show(sec);
+        if ( (sec) && (sec->mEditor) )
+        {
+                LLFloaterSearchReplace::show(sec->mEditor);
+        }
 }
 
 // static 
@@ -1335,7 +1190,10 @@ void LLPreviewLSL::onSearchReplace(void* userdata)
 {
         LLPreviewLSL* self = (LLPreviewLSL*)userdata;
         LLScriptEdCore* sec = self->mScriptEd; 
-        LLFloaterScriptSearch::show(sec);
+        if ( (sec) && (sec->mEditor) )
+        {
+                LLFloaterSearchReplace::show(sec->mEditor);
+        }
 }
 
 // static
@@ -2155,7 +2013,10 @@ void LLLiveLSLEditor::onSearchReplace(void* userdata)
         LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
 
         LLScriptEdCore* sec = self->mScriptEd; 
-        LLFloaterScriptSearch::show(sec);
+        if ( (sec) && (sec->mEditor) )
+        {
+                LLFloaterSearchReplace::show(sec->mEditor);
+        }
 }
 
 struct LLLiveLSLSaveData