Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/statemachine/aifetchinventoryfolder.cpp
View File

@@ -121,14 +121,14 @@ void AIFetchInventoryFolder::multiplex_impl(state_type run_state)
if (mFolderName.empty())
{
// We can only find a folder by name, or create it, if we know it's name.
llwarns << "Unknown folder ID " << mFolderUUID << llendl;
LL_WARNS() << "Unknown folder ID " << mFolderUUID << LL_ENDL;
abort();
break;
}
// Check if the parent exists.
if (mParentFolder != gInventory.getRootFolderID() && !gInventory.getCategory(mParentFolder))
{
llwarns << "Unknown parent folder ID " << mParentFolder << llendl;
LL_WARNS() << "Unknown parent folder ID " << mParentFolder << LL_ENDL;
abort();
break;
}

10
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -344,7 +344,7 @@ void AIFilePicker::initialize_impl(void)
mCanceled = false;
if (mFilter.empty())
{
llwarns << "Calling AIFilePicker::initialize_impl() with empty mFilter. Call open before calling run!" << llendl;
LL_WARNS() << "Calling AIFilePicker::initialize_impl() with empty mFilter. Call open before calling run!" << LL_ENDL;
abort();
return;
}
@@ -519,13 +519,13 @@ bool AIFilePicker::loadFile(std::string const& filename)
llifstream file(filepath);
if (file.is_open())
{
llinfos << "Loading filepicker context file at \"" << filepath << "\"." << llendl;
LL_INFOS() << "Loading filepicker context file at \"" << filepath << "\"." << LL_ENDL;
LLSDSerialize::fromXML(data, file);
}
if (!data.isMap())
{
llinfos << "File missing, ill-formed, or simply undefined; not changing the file (" << filepath << ")." << llendl;
LL_INFOS() << "File missing, ill-formed, or simply undefined; not changing the file (" << filepath << ")." << LL_ENDL;
return false;
}
@@ -558,14 +558,14 @@ bool AIFilePicker::saveFile(std::string const& filename)
file.open(filepath.c_str());
if (!file.is_open())
{
llwarns << "Unable to open filepicker context file for save: \"" << filepath << "\"." << llendl;
LL_WARNS() << "Unable to open filepicker context file for save: \"" << filepath << "\"." << LL_ENDL;
return false;
}
LLSDSerialize::toPrettyXML(context, file);
file.close();
llinfos << "Saved default paths to \"" << filepath << "\"." << llendl;
LL_INFOS() << "Saved default paths to \"" << filepath << "\"." << LL_ENDL;
return true;
}