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

Possible fix for a startup crash(es) 

Low impact
Kadah_Coba 2012-05-20 17:55:44 -07:00
parent 66d7bbe846
commit 91d6bb7cdd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsdata.cpp
View File

@ -499,7 +499,7 @@ void FSData::saveLLSD(const LLSD& data, const std::string& filename)
{
LL_INFOS("Data") << "Saving " << filename << LL_ENDL;
llofstream file;
file.open(filename);
file.open(filename.c_str());
if(!file.is_open())
{
LL_WARNS("Data") << "Unable to open " << filename << LL_ENDL;

2
indra/newview/lggbeamcolormapfloater.cpp
View File

@ -363,7 +363,7 @@ void lggBeamColorMapFloater::onClickSave()
LLSD main = getMyDataSerialized();
llofstream export_file;
export_file.open(filename);
export_file.open(filename.c_str());
LLSDSerialize::toPrettyXML(main, export_file);
export_file.close();

2
indra/newview/lggbeammapfloater.cpp
View File

@ -241,7 +241,7 @@ void lggBeamMapFloater::onClickSave()
main["data"] = getMyDataSerialized();
llofstream export_file;
export_file.open(filename);
export_file.open(filename.c_str());
LLSDSerialize::toPrettyXML(main, export_file);
export_file.close();
gSavedSettings.setString("FSBeamShape",gDirUtilp->getBaseFileName(filename,true));

4
indra/newview/llpanellogin.cpp
View File

@ -229,7 +229,7 @@ void LLPanelLogin::addUsersWithFavoritesToUsername()
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
LLSD fav_llsd;
llifstream file;
file.open(filename);
file.open(filename.c_str());
if (!file.is_open()) return;
LLSDSerialize::fromXML(fav_llsd, file);
for (LLSD::map_const_iterator iter = fav_llsd.beginMap();
@ -260,7 +260,7 @@ void LLPanelLogin::addFavoritesToStartLocation()
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "stored_favorites.xml");
LLSD fav_llsd;
llifstream file;
file.open(filename);
file.open(filename.c_str());
if (!file.is_open()) return;
LLSDSerialize::fromXML(fav_llsd, file);
for (LLSD::map_const_iterator iter = fav_llsd.beginMap();

2
indra/newview/llstartup.cpp
View File

@ -340,7 +340,7 @@ public:
std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grids.remote.xml");
llofstream out_file;
out_file.open(filename);
out_file.open(filename.c_str());
LLSDSerialize::toPrettyXML(content, out_file);
out_file.close();
llinfos << "GridListRequest: got new list." << llendl;