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

12
indra/llinventory/llparcel.cpp
View File

@@ -582,8 +582,8 @@ BOOL LLParcel::importAccessEntry(std::istream& input_stream, LLAccessEntry* entr
}
else
{
llwarns << "Unknown keyword in parcel access entry section: <"
<< keyword << ">" << llendl;
LL_WARNS() << "Unknown keyword in parcel access entry section: <"
<< keyword << ">" << LL_ENDL;
}
}
return input_stream.good();
@@ -1208,9 +1208,9 @@ void LLParcel::clearParcel()
void LLParcel::dump()
{
llinfos << "parcel " << mLocalID << " area " << mArea << llendl;
llinfos << " name <" << mName << ">" << llendl;
llinfos << " desc <" << mDesc << ">" << llendl;
LL_INFOS() << "parcel " << mLocalID << " area " << mArea << LL_ENDL;
LL_INFOS() << " name <" << mName << ">" << LL_ENDL;
LL_INFOS() << " desc <" << mDesc << ">" << LL_ENDL;
}
const std::string& ownership_status_to_string(LLParcel::EOwnershipStatus status)
@@ -1290,7 +1290,7 @@ LLParcel::ECategory category_string_to_category(const std::string& s)
return (LLParcel::ECategory)i;
}
}
llwarns << "Parcel category outside of possibilities " << s << llendl;
LL_WARNS() << "Parcel category outside of possibilities " << s << LL_ENDL;
return LLParcel::C_NONE;
}