diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-05-25 14:22:33 -0400 |
| commit | ee66cb3efccd6976c5a7725620956ea7030b7b57 (patch) | |
| tree | 7ae469e4d2aac985589e7df902959b27c603b2ad /indra/llcommon/llerror.cpp | |
| parent | 5ef8372e433896be174d7123bd4663087601a0df (diff) | |
| parent | 3e8dab32ee88e0a6fda51c218c61d718cf9dcafa (diff) | |
merge back beta tags
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; |