summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-22 15:53:28 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-06-22 15:53:28 -0400
commitba4c4bcbd19750c8b5a8ff88c9e410dbfef16fbd (patch)
treea274fae3ed2956dcb95ed16927be207cb12c593a /indra/llcommon/llerror.cpp
parentd912f24cb0cea21ce05a127824abb6a2c55231de (diff)
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
merge
Diffstat (limited to 'indra/llcommon/llerror.cpp')
-rw-r--r--indra/llcommon/llerror.cpp6
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;