diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-06 08:08:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-06 08:08:55 -0500 |
| commit | 66555b844dfcdb1bbbab472967a90060c5d0838f (patch) | |
| tree | 8d1550a5484dfd92ad8d5355d819dc0e479607c7 /indra/llcommon | |
| parent | 7b4f3f668b9f7553a418d0720994fe20d3e38f3a (diff) | |
| parent | f92fd78e74dc9810eeeaa314d8345015205a8297 (diff) | |
merge changes for vmrg-212
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 6 | ||||
| -rw-r--r-- | indra/llcommon/llerrorcontrol.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index c35799bbb9..e4381dbbd6 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -617,6 +617,12 @@ namespace LLError s.defaultLevel = level; } + ELevel getDefaultLevel() + { + Settings& s = Settings::get(); + return s.defaultLevel; + } + void setFunctionLevel(const std::string& function_name, ELevel level) { Globals& g = Globals::get(); diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h index fb75d45e2c..ed9de002f5 100644 --- a/indra/llcommon/llerrorcontrol.h +++ b/indra/llcommon/llerrorcontrol.h @@ -75,6 +75,7 @@ namespace LLError LL_COMMON_API void setPrintLocation(bool); LL_COMMON_API void setDefaultLevel(LLError::ELevel); + LL_COMMON_API ELevel getDefaultLevel(); LL_COMMON_API void setFunctionLevel(const std::string& function_name, LLError::ELevel); LL_COMMON_API void setClassLevel(const std::string& class_name, LLError::ELevel); LL_COMMON_API void setFileLevel(const std::string& file_name, LLError::ELevel); |