Second Life viewer sources 1.18.3.2-RC

1 files changed, 39 insertions, 7 deletions

diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index a2ea141..cce672b 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -291,6 +291,7 @@ LLScriptEdCore::LLScriptEdCore(
         const LLViewHandle& floater_handle,
         void (*load_callback)(void*),
         void (*save_callback)(void*, BOOL),
+        void (*search_replace_callback) (void* userdata),
         void* userdata,
         S32 bottom_pad)
         :
@@ -300,6 +301,7 @@ LLScriptEdCore::LLScriptEdCore(
         mEditor( NULL ),
         mLoadCallback( load_callback ),
         mSaveCallback( save_callback ),
+        mSearchReplaceCallback( search_replace_callback ),
         mUserdata( userdata ),
         mForceClose( FALSE ),
         mLastHelpToken(NULL),
@@ -1028,7 +1030,9 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 {
         if(getVisible() && getEnabled())
         {
-                if(('S' == key) && (MASK_CONTROL == (mask & MASK_CONTROL)))
+                bool just_control = MASK_CONTROL == (mask & MASK_MODIFIERS);
+
+                if(('S' == key) && just_control)
                 {
                         if(mSaveCallback)
                         {
@@ -1038,6 +1042,16 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
         
                         return TRUE;
                 }
+
+                if(('F' == key) && just_control)
+                {
+                        if(mSearchReplaceCallback)
+                        {
+                                mSearchReplaceCallback(mUserdata);
+                        }
+        
+                        return TRUE;
+                }
         }
         return FALSE;
 }
@@ -1071,6 +1085,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
                                                                    self->mViewHandle,
                                                                    LLPreviewLSL::onLoad,
                                                                    LLPreviewLSL::onSave,
+                                                                   LLPreviewLSL::onSearchReplace,
                                                                    self,
                                                                    0);
 
@@ -1220,6 +1235,13 @@ void LLPreviewLSL::open()		/*Flawfinder: ignore*/
         LLFloater::open();              /*Flawfinder: ignore*/
 }
 
+void LLPreviewLSL::onSearchReplace(void* userdata)
+{
+        LLPreviewLSL* self = (LLPreviewLSL*)userdata;
+        LLScriptEdCore* sec = self->mScriptEd; 
+        LLFloaterScriptSearch::show(sec);
+}
+
 // static
 void LLPreviewLSL::onLoad(void* userdata)
 {
@@ -1386,7 +1408,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
 
 
 // static
-void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         LLScriptSaveInfo* info = reinterpret_cast<LLScriptSaveInfo*>(user_data);
         if(0 == status)
@@ -1435,7 +1457,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
 }
 
 // static
-void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         LLUUID* instance_uuid = (LLUUID*)user_data;
         LLPreviewLSL* self = NULL;
@@ -1474,7 +1496,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
 
 // static
 void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type,
-                                                                   void* user_data, S32 status)
+                                                                   void* user_data, S32 status, LLExtStat ext_status)
 {
         lldebugs << "LLPreviewLSL::onLoadComplete: got uuid " << asset_uuid
                  << llendl;
@@ -1579,6 +1601,7 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
                                                                    self->mViewHandle,
                                                                    &LLLiveLSLEditor::onLoad,
                                                                    &LLLiveLSLEditor::onSave,
+                                                                   &LLLiveLSLEditor::onSearchReplace,
                                                                    self,
                                                                    0);
 
@@ -1793,7 +1816,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
 // static
 void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
                                                                          LLAssetType::EType type,
-                                                                         void* user_data, S32 status)
+                                                                         void* user_data, S32 status, LLExtStat ext_status)
 {
         lldebugs << "LLLiveLSLEditor::onLoadComplete: got uuid " << asset_id
                  << llendl;
@@ -1976,6 +1999,15 @@ void LLLiveLSLEditor::draw()
         }
 }
 
+
+void LLLiveLSLEditor::onSearchReplace(void* userdata)
+{
+        LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
+
+        LLScriptEdCore* sec = self->mScriptEd; 
+        LLFloaterScriptSearch::show(sec);
+}
+
 struct LLLiveLSLSaveData
 {
         LLLiveLSLSaveData(const LLUUID& id, const LLViewerInventoryItem* item, BOOL active);
@@ -2189,7 +2221,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
         runningCheckbox->setEnabled(TRUE);
 }
 
-void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
 
@@ -2219,7 +2251,7 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
 }
 
 
-void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status) // StoreAssetData callback (fixed)
+void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         LLLiveLSLSaveData* data = (LLLiveLSLSaveData*)user_data;
         if(!data)