summaryrefslogtreecommitdiff
path: root/indra/llxuixml/llregistry.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-02 18:01:37 -0700
committerRichard Linden <none@none>2012-07-02 18:01:37 -0700
commit86471b92a0bad3a0453b7f942c8490ecd4182070 (patch)
tree1ec43b787a6fb8974e688b9b4835d289b59b6563 /indra/llxuixml/llregistry.h
parentf22e5df8b6890aab659916361d42479ca3825be9 (diff)
parent1bd52dfbdc3607bbd9ea86c715ce63b17d5a557f (diff)
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llxuixml/llregistry.h')
-rw-r--r--indra/llxuixml/llregistry.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llxuixml/llregistry.h b/indra/llxuixml/llregistry.h
index 36ce6a97b7..3e8d9267cc 100644
--- a/indra/llxuixml/llregistry.h
+++ b/indra/llxuixml/llregistry.h
@@ -302,6 +302,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);
}
};