diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-10-09 16:10:00 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-10-09 16:10:00 -0700 |
| commit | f9113c286fae143962f1d79663e66a303c46ce51 (patch) | |
| tree | 9190363e14749efdb3f46de02c67c377a0b9718e /indra/newview/llpreviewscript.cpp | |
| parent | 873a72fdbad8bca29cf8129b318719c1af5f8e9d (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
Merge
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 17727ef9a1..17f250c3ad 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1238,7 +1238,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(); @@ -2166,6 +2166,7 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType mScriptEd->setScriptText(LLStringExplicit(&buffer[0]), TRUE); mScriptEd->mEditor->makePristine(); + mScriptEd->setScriptName(getItem()->getName()); } |