livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes per Oz's suggestion on RB.

meow-7.2.2
Ima Mechanique 2012-01-04 15:16:35 +00:00
parent 032a5e4572
commit ce6bd89ca4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llpreviewscript.cpp
View File

@ -1154,18 +1154,15 @@ 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 ) )
{
//File picking cancelled by user, so nothing to do.
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 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 );
}
}
@ -1187,8 +1184,7 @@ bool LLScriptEdCore::enableSaveToFileMenu(void* userdata)
bool LLScriptEdCore::enableLoadFromFileMenu(void* userdata)
{
LLScriptEdCore* self = (LLScriptEdCore*)userdata;
if (!self || !self->mEditor) return FALSE;
return self->mEditor->canLoadOrSaveToFile();
return (self && self->mEditor) ? self->mEditor->canLoadOrSaveToFile() : FALSE;
}
/// ---------------------------------------------------------------------------