diff options
author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/llui/llfloaterreg.cpp | |
parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) |
merge
Diffstat (limited to 'indra/llui/llfloaterreg.cpp')
-rwxr-xr-x | indra/llui/llfloaterreg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 1cdddf0d5b..072addfa4a 100755 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -151,13 +151,13 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) res = build_func(key); if (!res) { - llwarns << "Failed to build floater type: '" << name << "'." << llendl; + LL_WARNS() << "Failed to build floater type: '" << name << "'." << LL_ENDL; return NULL; } bool success = res->buildFromFile(xui_file); if (!success) { - llwarns << "Failed to build floater type: '" << name << "'." << llendl; + LL_WARNS() << "Failed to build floater type: '" << name << "'." << LL_ENDL; return NULL; } @@ -179,7 +179,7 @@ LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key) } if (!res) { - llwarns << "Floater type: '" << name << "' not registered." << llendl; + LL_WARNS() << "Floater type: '" << name << "' not registered." << LL_ENDL; } } return res; @@ -475,7 +475,7 @@ void LLFloaterReg::toggleInstanceOrBringToFront(const LLSD& sdname, const LLSD& if (!instance) { - lldebugs << "Unable to get instance of floater '" << name << "'" << llendl; + LL_DEBUGS() << "Unable to get instance of floater '" << name << "'" << LL_ENDL; return; } |