9 files changed, 183 insertions, 34 deletions

diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 7b4caa8..d953e45 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -329,6 +329,17 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                         L"Targa, Bitmap Images (*.tga; *.bmp)\0*.tga;*.bmp\0" \
                         L"\0";
                 break;
+        case FFSAVE_LSL:
+                if (filename.empty())
+                {
+                        wcsncpy( mFilesW,L"untitled.lsl", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
+                }
+                mOFN.lpstrDefExt = L"lsl";
+                mOFN.lpstrFilter = 
+                        L"LSL Files (*.lsl)\0*.lsl\0"
+                        L"Text files (*.txt)\0*.txt\0"
+                        L"\0";
+                break;
         case FFSAVE_TEXT:
                 if (filename.empty())
                 {
@@ -338,7 +349,6 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                 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:
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index 63699b2..fb20ed3 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -113,6 +113,7 @@ public:
                 FFSAVE_JPEG = 14,
                 FFSAVE_HPA = 15,
                 FFSAVE_TEXT = 16,
+                FFSAVE_LSL = 17
         };
 
         // open the dialog. This is a modal operation
diff --git a/linden/indra/newview/llpreviewnotecard.cpp b/linden/indra/newview/llpreviewnotecard.cpp
index 4260434..be5d801 100644
--- a/linden/indra/newview/llpreviewnotecard.cpp
+++ b/linden/indra/newview/llpreviewnotecard.cpp
@@ -40,6 +40,7 @@
 #include "llassetuploadresponders.h"
 #include "llviewerwindow.h"
 #include "llbutton.h"
+#include "llfilepicker.h"
 #include "llfloatersearchreplace.h"
 #include "llinventorymodel.h"
 #include "lllineeditor.h"
@@ -664,7 +665,23 @@ LLTextEditor* LLPreviewNotecard::getEditor()
 
 void LLPreviewNotecard::initMenu()
 {
-        LLMenuItemCallGL* menuItem = getChild<LLMenuItemCallGL>("Undo");
+        // File menu
+
+        LLMenuItemCallGL* menuItem = getChild<LLMenuItemCallGL>("Save Menu");
+        menuItem->setMenuCallback(onSaveMenu, this);
+        menuItem->setEnabledCallback(enableSaveMenu);
+
+        menuItem = getChild<LLMenuItemCallGL>("Export Text...");
+        menuItem->setMenuCallback(onExportTextMenu, this);
+        menuItem->setEnabledCallback(enableExportTextMenu);
+
+        menuItem = getChild<LLMenuItemCallGL>("Import Text...");
+        menuItem->setMenuCallback(onImportTextMenu, this);
+        menuItem->setEnabledCallback(enableImportTextMenu);
+
+        // Edit menu
+
+        menuItem = getChild<LLMenuItemCallGL>("Undo");
         menuItem->setMenuCallback(onUndoMenu, this);
         menuItem->setEnabledCallback(enableUndoMenu);
 
@@ -697,6 +714,77 @@ void LLPreviewNotecard::initMenu()
         menuItem->setEnabledCallback(NULL);
 }
 
+//static 
+void LLPreviewNotecard::onSaveMenu(void* userdata)
+{
+        LLPreviewNotecard* preview = (LLPreviewNotecard*)userdata;
+        if (preview)
+        {
+                preview->saveIfNeeded();
+        }
+}
+
+//static 
+void LLPreviewNotecard::onExportTextMenu(void* userdata)
+{
+        LLPreviewNotecard* preview = (LLPreviewNotecard*)userdata;
+
+        if (preview)
+        {
+                LLViewerTextEditor* editor = preview->getChild<LLViewerTextEditor>("Notecard Editor");
+                if (editor)
+                {
+                        LLFilePicker& file_picker = LLFilePicker::instance();
+                        const LLViewerInventoryItem *item = preview->getItem();
+                        if (!file_picker.getSaveFile(LLFilePicker::FFSAVE_TEXT, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null))
+                        {
+                                return;
+                        }
+
+                        std::string filename = file_picker.getFirstFile();
+                        std::string scriptText = editor->getText();
+                        std::ofstream fout(filename.c_str());
+                        fout << scriptText;
+                        fout.close();
+                }
+        }
+}
+
+//static 
+void LLPreviewNotecard::onImportTextMenu(void* userdata)
+{
+        LLPreviewNotecard* preview = (LLPreviewNotecard*)userdata;
+
+        if (preview)
+        {
+                LLViewerTextEditor* editor = preview->getChild<LLViewerTextEditor>("Notecard Editor");
+                if (editor)
+                {
+                        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());
+
+                        editor->clear();
+                                        
+                        std::string line;
+                        while (!fin.eof())
+                        { 
+                                getline(fin, line);
+                                line = line + "\n";
+                                editor->insertText(line);
+                        }
+                        fin.close();
+
+                        preview->saveIfNeeded();
+                }
+        }
+}
+
 // static 
 void LLPreviewNotecard::onSearchMenu(void* userdata)
 {
@@ -809,6 +897,42 @@ void LLPreviewNotecard::onDeselectMenu(void* userdata)
         }
 }
 
+//static 
+BOOL LLPreviewNotecard::enableSaveMenu(void* userdata)
+{
+        LLPreviewNotecard* self = (LLPreviewNotecard*)userdata;
+        if (!self) return FALSE;
+        LLViewerTextEditor* editor = self->getChild<LLViewerTextEditor>("Notecard Editor");
+        if (!editor) return FALSE;
+        return !editor->isPristine();
+}
+
+//static 
+BOOL LLPreviewNotecard::enableExportTextMenu(void* userdata)
+{
+        LLPreviewNotecard* self = (LLPreviewNotecard*)userdata;
+        if (!self) return FALSE;
+        LLViewerTextEditor* editor = self->getChild<LLViewerTextEditor>("Notecard Editor");
+        if (!editor) return FALSE;
+        
+        // request the asset
+        const LLInventoryItem* item = self->getItem();
+        return (item && (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE) || gAgent.isGodlike()));
+}
+
+//static 
+BOOL LLPreviewNotecard::enableImportTextMenu(void* userdata)
+{
+        LLPreviewNotecard* self = (LLPreviewNotecard*)userdata;
+        if (!self) return FALSE;
+        LLViewerTextEditor* editor = self->getChild<LLViewerTextEditor>("Notecard Editor");
+        if (!editor) return FALSE;
+
+        // request the asset
+        const LLInventoryItem* item = self->getItem();
+        return (item && (gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE) || gAgent.isGodlike()));
+}
+
 // static 
 BOOL LLPreviewNotecard::enableUndoMenu(void* userdata)
 {
diff --git a/linden/indra/newview/llpreviewnotecard.h b/linden/indra/newview/llpreviewnotecard.h
index a879fec..e3129ec 100644
--- a/linden/indra/newview/llpreviewnotecard.h
+++ b/linden/indra/newview/llpreviewnotecard.h
@@ -112,6 +112,9 @@ protected:
 
         void                    initMenu();
 
+        static void             onSaveMenu(void* userdata);
+        static void             onExportTextMenu(void* userdata);
+        static void             onImportTextMenu(void* userdata);
         static void             onSearchMenu(void* userdata);
         static void             onUndoMenu(void* userdata);
         static void             onRedoMenu(void* userdata);
@@ -121,6 +124,9 @@ protected:
         static void             onSelectAllMenu(void* userdata);
         static void             onDeselectMenu(void* userdata);
 
+        static BOOL             enableSaveMenu(void* userdata);
+        static BOOL             enableExportTextMenu(void* userdata);
+        static BOOL             enableImportTextMenu(void* userdata);
         static BOOL             enableUndoMenu(void* userdata);
         static BOOL             enableRedoMenu(void* userdata);
         static BOOL             enableCutMenu(void* userdata);
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index d200e32..c77f7ff 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -294,11 +294,11 @@ void LLScriptEdCore::initMenu()
         menuItem->setMenuCallback(onBtnHelp, this);
         menuItem->setEnabledCallback(NULL);
 
-        menuItem = getChild<LLMenuItemCallGL>("Load from Disk");
+        menuItem = getChild<LLMenuItemCallGL>("Import Script...");
         menuItem->setMenuCallback(onBtnLoadFromDisc, this);
         menuItem->setEnabledCallback(NULL);
 
-        menuItem = getChild<LLMenuItemCallGL>("Save to Disk");
+        menuItem = getChild<LLMenuItemCallGL>("Export Script...");
         menuItem->setMenuCallback(onBtnSaveToDisc, this);
         menuItem->setEnabledCallback(NULL);
 
@@ -732,36 +732,34 @@ void LLScriptEdCore::onBtnUndoChanges( void* userdata )
 
 void LLScriptEdCore::onBtnSaveToDisc( void* userdata )
 {
-
         LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
 
-   LLScriptEdCore* self = (LLScriptEdCore*) userdata;
+        LLScriptEdCore* self = (LLScriptEdCore*) userdata;
 
-   if( self->mSaveCallback )
-   {
-      LLFilePicker& file_picker = LLFilePicker::instance();
-        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TEXT ) )
+        if (self->mSaveCallback)
         {
-                return;
-        }
-        
+                LLFilePicker& file_picker = LLFilePicker::instance();
+                const LLViewerInventoryItem *item = ((LLPreviewLSL*)self->getParent())->getItem();
+                if (!file_picker.getSaveFile(LLFilePicker::FFSAVE_LSL, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null))
+                {
+                        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 );
-         
-   }
-        
+                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 ) )
+        if (!file_picker.getOpenFile(LLFilePicker::FFLOAD_TEXT))
         {
                 return;
         }
@@ -771,17 +769,14 @@ void LLScriptEdCore::onBtnLoadFromDisc( void* data )
         std::ifstream fin(filename.c_str());
         
         std::string line;
-        std::string linetotal;
         self->mEditor->clear();
         while (!fin.eof())
         { 
                 getline(fin,line);
-                line=line+"\n";
+                line = line + "\n";
                 self->mEditor->insertText(line);
-
         }
         fin.close();
-        
 }
 
 void LLScriptEdCore::onSearchMenu(void* userdata)
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index 0d5c300..8e61435 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -138,6 +138,7 @@ protected:
 private:
         std::string             mSampleText;
         std::string             mHelpURL;
+        std::string             mScriptTitle;
         LLTextEditor*   mEditor;
         void                    (*mLoadCallback)(void* userdata);
         void                    (*mSaveCallback)(void* userdata, BOOL close_after_save);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
index ed26e11..a625598 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
@@ -20,6 +20,12 @@
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
+    <menu drop_shadow="true" enabled="true" mouse_opaque="false" name="File" opaque="true" tear_off="false">
+      <menu_item_call enabled="false" mouse_opaque="true" label="Save" name="Save Menu" shortcut="control|S" />
+      <menu_item_separator />
+      <menu_item_call enabled="false" mouse_opaque="true" label="Export Text..." name="Export Text..." />
+      <menu_item_call enabled="false" mouse_opaque="true" label="Import Text..." name="Import Text..." />
+    </menu>
                 <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
                      mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
                         <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
index cd651dd..ec3ce5a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
@@ -20,6 +20,12 @@
         <menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
              height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
              tear_off="false" width="220">
+    <menu drop_shadow="true" enabled="true" mouse_opaque="false" name="File" opaque="true" tear_off="false">
+      <menu_item_call enabled="false" mouse_opaque="true" label="Save" name="Save Menu" shortcut="control|S" />
+      <menu_item_separator />
+      <menu_item_call enabled="false" mouse_opaque="true" label="Export Text..." name="Export Text..." />
+      <menu_item_call enabled="false" mouse_opaque="true" label="Import Text..." name="Import Text..." />
+    </menu>
                 <menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
                      mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
                         <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
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 b4577e6..82a65b8 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
@@ -37,10 +37,10 @@
                              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_item_call bottom_delta="-76" height="20" label="Export Script..." left="0"
+     mouse_opaque="true" name="Export Script..." width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Import Script..." left="0"
+     mouse_opaque="true" name="Import Script..." 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"
@@ -71,11 +71,11 @@
                 <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"
+                        <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="Launch Autoscript..." left="0"
+      <menu_item_call bottom="-30" enabled="true" height="20" label="Launch Autoscript" left="0"
            mouse_opaque="true" name="Launch Autoscript..." width="112" />
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
+                        <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>