summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
commit9ff4265baff19984096533f9dbd51ec255d9960c (patch)
tree1cce734a7f7ac04a0aaa248adc7aa9fcfb6bc687 /indra/llcommon/llerror.cpp
parent7236b1f4f8b3c14fe18af3d0bd5ee131ea7103dc (diff)
parent3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff)
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llcommon/llerror.cpp')
-rw-r--r--indra/llcommon/llerror.cpp6
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();