diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-09 09:05:14 -0500 |
| commit | 03290257345c22f909cf1cfac3981e7e07820d21 (patch) | |
| tree | 4b4be7538fb1768f32d6b3c2e7cd060b48d2faca /indra/llcommon/llerror.cpp | |
| parent | 889d4d292b2318a2be4988a700d5f56a193a377a (diff) | |
| parent | 41ceee848bbbaec892471b6396bd2d2383d10aa3 (diff) | |
merge up to latest 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(); |