Added script load/save from Meerkat viewer

7 files changed, 87 insertions, 99 deletions

diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 954a274..ece30dd 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -327,6 +327,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                         L"Targa, Bitmap Images (*.tga; *.bmp)\0*.tga;*.bmp\0" \
                         L"\0";
                 break;
+        case FFSAVE_TEXT:
+                if (filename.empty())
+                {
+                        wcsncpy( mFilesW,L"untitled.txt", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
+                }
+                mOFN.lpstrDefExt = L"txt";
+                mOFN.lpstrFilter = 
+                        L"Text files (*.txt)\0*.txt\0"
+                        L"RTF Files (*.rtf)\0*.rtf\0"
+                        L"LSL Files (*.lsl)\0*.lsl\0"
+                        L"\0";
+                break;
         case FFSAVE_WAV:
                 if (filename.empty())
                 {
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index aea414a..f9f859f 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -90,6 +90,7 @@ public:
                 FFLOAD_XML = 6,
                 FFLOAD_SLOBJECT = 7,
                 FFLOAD_RAW = 8,
+                FFLOAD_TEXT = 9,
         };
 
         enum ESaveFilter
@@ -109,6 +110,8 @@ public:
                 FFSAVE_J2C = 12,
                 FFSAVE_PNG = 13,
                 FFSAVE_JPEG = 14,
+                FFSAVE_HPA = 15,
+                FFSAVE_TEXT = 16,
         };
 
         // open the dialog. This is a modal operation
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 1e9def3..6273011 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -436,6 +436,14 @@ void LLScriptEdCore::initMenu()
         menuItem->setMenuCallback(onBtnHelp, this);
         menuItem->setEnabledCallback(NULL);
 
+        menuItem = getChild<LLMenuItemCallGL>("Load from Disk");
+        menuItem->setMenuCallback(onBtnLoadFromDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
+        menuItem = getChild<LLMenuItemCallGL>("Save to Disk");
+        menuItem->setMenuCallback(onBtnSaveToDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
         menuItem = getChild<LLMenuItemCallGL>("LSL Wiki Help...");
         menuItem->setMenuCallback(onBtnDynamicHelp, this);
         menuItem->setEnabledCallback(NULL);
@@ -547,6 +555,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         if (!history_combo) return;
 
         LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+        url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
         url_string.setArg("[LSL_STRING]", help_string);
 
         addHelpItemToHistory(help_string);
@@ -773,6 +782,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+                url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);
                 web_browser->navigateTo(url_string);
         }
@@ -823,6 +833,60 @@ void LLScriptEdCore::onBtnUndoChanges( void* userdata )
         }
 }
 
+void LLScriptEdCore::onBtnSaveToDisc( void* userdata )
+{
+
+        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
+
+   LLScriptEdCore* self = (LLScriptEdCore*) userdata;
+
+   if( self->mSaveCallback )
+   {
+      LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TEXT ) )
+        {
+                return;
+        }
+        
+                std::string filename = file_picker.getFirstFile();
+      std::string scriptText=self->mEditor->getText();
+          std::ofstream fout(filename.c_str());
+      fout<<(scriptText);
+      fout.close();
+      self->mSaveCallback( self->mUserdata, FALSE );
+         
+   }
+        
+}
+void LLScriptEdCore::onBtnLoadFromDisc( void* data )
+{
+
+        LLScriptEdCore* self = (LLScriptEdCore*) data;
+        
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_TEXT ) )
+        {
+                return;
+        }
+        
+        std::string filename = file_picker.getFirstFile();
+
+        std::ifstream fin(filename.c_str());
+        
+        std::string line;
+        std::string linetotal;
+        self->mEditor->clear();
+        while (!fin.eof())
+        { 
+                getline(fin,line);
+                line=line+"\n";
+                self->mEditor->insertText(line);
+
+        }
+        fin.close();
+        
+}
+
 void LLScriptEdCore::onSearchMenu(void* userdata)
 {
         LLScriptEdCore* sec = (LLScriptEdCore*)userdata;
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 7026482..97e721d 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -95,6 +95,8 @@ public:
         static void             doSave( void* userdata, BOOL close_after_save );
         static void             onBtnSave(void*);
         static void             onBtnUndoChanges(void*);
+        static void             onBtnSaveToDisc(void*);
+        static void             onBtnLoadFromDisc(void*);
         static void             onSearchMenu(void* userdata);
 
         static void             onUndoMenu(void* userdata);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index b83a6df..653c75b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -35,6 +35,12 @@
                              width="138" />
                         <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
                              mouse_opaque="true" name="Revert All Changes" width="138" />
+      <menu_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator"
+     width="138" />
+      <menu_item_call bottom_delta="-76" height="20" label="Save to Disk" left="0"
+     mouse_opaque="true" name="Save to Disk" width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Load from Disk" left="0"
+     mouse_opaque="true" name="Load from Disk" width="138" />
                 </menu>
                 <menu bottom="665" drop_shadow="true" enabled="true" height="198"
                      left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
deleted file mode 100644
index 12ae6dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     left="0" mouse_opaque="true" name="script panel" width="500">
-        <text_editor type="string" length="1" bottom="-393"
-             embedded_items="false" enabled="true" follows="left|top|right|bottom"
-             font="Monospace" height="376" ignore_tab="false" left="4"
-             max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
-             word_wrap="true" show_line_numbers="true">
-                Loading...
-        </text_editor>
-        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Save" label_selected="Save" left="360"
-             mouse_opaque="true" name="Save_btn" width="128" />
-        <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
-             multi_select="false" name="lsl errors" width="492" />
-        <combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-             height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
-             name="Insert..." width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-473" drop_shadow_visible="true" enabled="true"
-             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
-             width="128" />
-        <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
-             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
-             tear_off="false" width="476">
-                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
-                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
-                     width="138">
-                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
-                             name="Save" width="138" />
-                        <menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
-                             width="138" />
-                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
-                             mouse_opaque="true" name="Revert All Changes" width="138" />
-                </menu>
-                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
-                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-                     width="139">
-                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-                             mouse_opaque="true" name="Undo" width="139" />
-                        <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-                             mouse_opaque="true" name="Redo" width="139" />
-                        <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="139" />
-                        <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-                             mouse_opaque="true" name="Cut" width="139" />
-                        <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-                             mouse_opaque="true" name="Copy" width="139" />
-                        <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-                             mouse_opaque="true" name="Paste" width="139" />
-                        <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="139" />
-                        <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-                             mouse_opaque="true" name="Select All" width="139" />
-                        <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-                             mouse_opaque="true" name="Deselect" width="139" />
-                        <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator3" width="139" />
-                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
-                </menu>
-                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
-                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
-                     width="112">
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
-                             mouse_opaque="true" name="Help..." width="112" />
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
-                             mouse_opaque="true" name="LSL Wiki Help..." width="112" />
-                </menu>
-        </menu_bar>
-        <string name="loading">
-                Loading...
-        </string>
-        <string name="can_not_view">
-                You are not allowed to view this script.
-        </string>
-        <string name="public_objects_can_not_run">
-                Public Objects cannot run scripts
-        </string>
-        <string name="script_running">
-                Running
-        </string>
-</panel>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
deleted file mode 100644
index c44457c..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" left="408" min_height="100"
-     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
-     width="300">
-        <button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" label="Close" label_selected="Close" left="220"
-             mouse_opaque="true" name="close" width="64" />
-        <scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
-             multi_select="false" name="queue output" width="292" />
-</floater>