diff options
| author | Richard Linden <none@none> | 2012-07-02 22:51:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-02 22:51:14 -0700 |
| commit | 092bb735645db448b55716754e6d0057ebc42ebf (patch) | |
| tree | a3d620b24693be4362674c02bc912f1393cf4d61 /indra/llxuixml/llregistry.h | |
| parent | f22e5df8b6890aab659916361d42479ca3825be9 (diff) | |
| parent | 062cae9a4880f7672df7f6189e01b2bff15f42f1 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/llxuixml/llregistry.h')
| -rw-r--r-- | indra/llxuixml/llregistry.h | 4 |
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); } }; |