summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorcontrol.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
commit3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch)
tree7cd7cef085a002885a362337fc8b67060bfcc395 /indra/llcommon/llerrorcontrol.h
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
-rw-r--r--indra/llcommon/llerrorcontrol.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h
index 56ac52e5de..56e84f7172 100644
--- a/indra/llcommon/llerrorcontrol.h
+++ b/indra/llcommon/llerrorcontrol.h
@@ -189,6 +189,11 @@ namespace LLError
LL_COMMON_API std::string abbreviateFile(const std::string& filePath);
LL_COMMON_API int shouldLogCallCount();
+
+ // Check whether Globals exists. This should only be used by LLSingleton
+ // infrastructure to avoid trying to log when our internal LLSingleton is
+ // unavailable -- circularity ensues.
+ LL_COMMON_API bool is_available();
};
#endif // LL_LLERRORCONTROL_H