summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-18 22:23:30 -0400
committerOz Linden <oz@lindenlab.com>2012-06-18 22:23:30 -0400
commitd7400ae60c0453e111357abfb09d8308adf8b721 (patch)
treecfbbc175c4df5d0929ad923c5c52489b8d87fb75 /indra/llcommon/llerror.h
parentd500379cea865e4a6958eee82b5615ace61036c4 (diff)
parent9cac312f57391792e9fce380c2c38ae4060ae1d7 (diff)
merge to pathfinding development branch
Diffstat (limited to 'indra/llcommon/llerror.h')
-rw-r--r--indra/llcommon/llerror.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index b3e604f8e8..a72e9a4892 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -143,9 +143,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();