summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
committerDave Parks <davep@lindenlab.com>2012-06-28 13:50:35 -0500
commitdb5d1b851a0d808dc1e8b0896fad734c2c54a03f (patch)
treeebe50ddb5e1aa700d54f50bbc1ab4b435462b85e /indra/llcommon/llerror.cpp
parent1d8f117069945499ac297ef13eb6a916a2b96d72 (diff)
parented72fd0ae98671f1cfce3c975b93e1f760fc40f0 (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;