summaryrefslogtreecommitdiff
path: root/indra/llcommon/llregistry.h
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
committerdolphin <dolphin@lindenlab.com>2013-04-02 15:04:41 -0700
commitf684d897f532bcba87cda1f72bd19efac82f6cb6 (patch)
tree6222ff28ee7825e987a127383a081297a80d7e6c /indra/llcommon/llregistry.h
parent4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff)
parent90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llcommon/llregistry.h')
-rw-r--r--indra/llcommon/llregistry.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcommon/llregistry.h b/indra/llcommon/llregistry.h
index 853c427a13..bb0d60247e 100644
--- a/indra/llcommon/llregistry.h
+++ b/indra/llcommon/llregistry.h
@@ -307,6 +307,10 @@ public:
virtual ~StaticRegistrar() {}
StaticRegistrar(ref_const_key_t key, ref_const_value_t value)
{
+ if (singleton_t::instance().exists(key))
+ {
+ llerrs << "Duplicate registry entry under key \"" << key << "\"" << llendl;
+ }
singleton_t::instance().mStaticScope->add(key, value);
}
};