diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
| commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
| tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/llpreviewscript.cpp | |
| parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
| parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) | |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rwxr-xr-x | indra/newview/llpreviewscript.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 9411b8265b..8eea5ea73e 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1166,7 +1166,7 @@ void LLScriptEdCore::onBtnSaveToFile( void* userdata ) if( self->mSaveCallback ) { LLFilePicker& file_picker = LLFilePicker::instance(); - if( file_picker.getSaveFile( LLFilePicker::FFSAVE_SCRIPT ) ) + if( file_picker.getSaveFile( LLFilePicker::FFSAVE_SCRIPT, self->mScriptName ) ) { std::string filename = file_picker.getFirstFile(); std::string scriptText=self->mEditor->getText(); @@ -1948,6 +1948,7 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType mScriptEd->setScriptText(LLStringExplicit(&buffer[0]), TRUE); mScriptEd->mEditor->makePristine(); + mScriptEd->setScriptName(getItem()->getName()); } |