diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-06 11:15:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-06 11:15:24 -0500 |
| commit | f35a662b66e93d916fc439a155aeff6446852405 (patch) | |
| tree | 884da65c01a892fdb12f6f2f69fbee90c72a4310 /indra/llcommon/llerrorcontrol.h | |
| parent | ca36a06d2e994178cecfae249f7f1cc3af3554a0 (diff) | |
| parent | 106bac8ed77339e7c986b3066bf96210d327898d (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon/llerrorcontrol.h')
| -rw-r--r-- | indra/llcommon/llerrorcontrol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcommon/llerrorcontrol.h b/indra/llcommon/llerrorcontrol.h index ed9de002f5..1be49cebc8 100644 --- a/indra/llcommon/llerrorcontrol.h +++ b/indra/llcommon/llerrorcontrol.h @@ -80,7 +80,8 @@ namespace LLError LL_COMMON_API void setClassLevel(const std::string& class_name, LLError::ELevel); LL_COMMON_API void setFileLevel(const std::string& file_name, LLError::ELevel); LL_COMMON_API void setTagLevel(const std::string& file_name, LLError::ELevel); - + + LL_COMMON_API LLError::ELevel decodeLevel(std::string name); LL_COMMON_API void configure(const LLSD&); // the LLSD can configure all of the settings // usually read automatically from the live errorlog.xml file |