diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-02 11:53:42 -0400 |
commit | 86d33e21a73e1f9db5b88b7169e32070c488bb48 (patch) | |
tree | 6c09925f34719c43c543dc23c8095af7a2c392d9 /indra/llcommon/llerror.h | |
parent | 22b1223ea7d68b27304cdd713f8e8b491b654060 (diff) | |
parent | b7555a3309bda8e9689627901051aa90fcb7be34 (diff) |
merge
Diffstat (limited to 'indra/llcommon/llerror.h')
-rw-r--r-- | indra/llcommon/llerror.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h index b3e604f8e8..b65b410153 100644 --- a/indra/llcommon/llerror.h +++ b/indra/llcommon/llerror.h @@ -35,7 +35,7 @@ #include "stdtypes.h" -/* Error Logging Facility +/** Error Logging Facility Information for most users: @@ -100,7 +100,6 @@ even release. Which means you can use them to help debug even when deployed to a real grid. */ - namespace LLError { enum ELevel @@ -143,9 +142,13 @@ namespace LLError CallSite(ELevel, const char* file, int line, const std::type_info& class_info, const char* function, const char* broadTag, const char* narrowTag, bool printOnce); +#ifdef LL_LIBRARY_INCLUDE + bool shouldLog(); +#else // LL_LIBRARY_INCLUDE bool shouldLog() { return mCached ? mShouldLog : Log::shouldLog(*this); } // this member function needs to be in-line for efficiency +#endif // LL_LIBRARY_INCLUDE void invalidate(); |