diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-03-21 13:03:04 -0400 |
| commit | 3238cebcb098cfb36aeeee37a7498d569ab04955 (patch) | |
| tree | 4459c297533a53bc93dfb11316552805c3ff4500 /indra/llcommon/llerror.cpp | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | cabb6b6a5f339a69fec25b836f46b8b470eebb90 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llcommon/llerror.cpp')
| -rw-r--r-- | indra/llcommon/llerror.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index e4381dbbd6..7e6eee0f3c 100644 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -654,9 +654,7 @@ namespace LLError g.invalidateCallSites(); s.tagLevelMap[tag_name] = level; } -} -namespace { LLError::ELevel decodeLevel(std::string name) { static LevelMap level_names; @@ -681,7 +679,9 @@ namespace { return i->second; } - +} + +namespace { void setLevels(LevelMap& map, const LLSD& list, LLError::ELevel level) { LLSD::array_const_iterator i, end; |