summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerrorcontrol.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
commit3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch)
tree7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/llcommon/llerrorcontrol.h
parent33c88a1c6037290924691db59c6538a370946ea4 (diff)
parent687efd84eabc524e339e61458b0cbf53f9a38f8a (diff)
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
-rwxr-xr-xindra/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 100755
--- 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