diff options
author | Leslie Linden <leslie@lindenlab.com> | 2012-01-09 09:56:52 -0800 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-09 09:56:52 -0800 |
commit | 1422be8312fcf19cbeecda8c109ea1e7b11eaa49 (patch) | |
tree | 7d78e1590126e849750755ab73f09edf8de9bc17 /indra/llcommon/llerror.cpp | |
parent | c98bf3cd509dd7bf10837713a911f9932c476e1f (diff) | |
parent | 3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/llcommon/llerror.cpp')
-rw-r--r-- | indra/llcommon/llerror.cpp | 6 |
1 files changed, 6 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(); |