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

10
indra/llui/llview.h
View File

@@ -122,7 +122,7 @@ public:
if (registry->isTagRegistered(tag))
{
//error!
llerrs << "Widget named " << tag << " already registered!" << llendl;
LL_ERRS() << "Widget named " << tag << " already registered!" << LL_ENDL;
}
else
{
@@ -557,7 +557,7 @@ public:
// did we find *something* with that name?
if (child)
{
llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << llendl;
LL_WARNS() << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << LL_ENDL;
}
if (create_if_missing)
{
@@ -584,7 +584,7 @@ public:
std::string xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
if (xml_tag.empty())
{
llwarns << "No xml tag registered for this class " << llendl;
LL_WARNS() << "No xml tag registered for this class " << LL_ENDL;
return NULL;
}
// create dummy xml node (<button name="foo"/>)
@@ -595,13 +595,13 @@ public:
if (widget)
{
// need non-const to update private dummy widget cache
llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl;
LL_WARNS() << "Making dummy " << xml_tag << " named " << name << " in " << getName() << LL_ENDL;
mDummyWidgets.insert(std::make_pair(name, widget));
}
else
{
// dynamic cast will fail if T::fromXML only registered for base class
llwarns << "Failed to create dummy widget of requested type " << llendl;
LL_WARNS() << "Failed to create dummy widget of requested type " << LL_ENDL;
return NULL;
}
}