diff options
| author | James Cook <james@lindenlab.com> | 2009-11-11 16:36:02 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-11 16:36:02 -0800 |
| commit | 7eb8bb4ad18c313c178bb7977adee8e0044b14b7 (patch) | |
| tree | 83a8899318b476a10acb738a27001049ded19618 /indra | |
| parent | 6a3e8353a7c0e80e2a4558e3a3a345646788981e (diff) | |
| parent | 391f423cd0633262233d474622b56dd3b151ab32 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index dd807a3f7e..aaadc1b58d 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -38,7 +38,11 @@ #include "llpanel.h" #include "lluictrlfactory.h" -static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); +// This breaks the ability to construct dummy LLUICtrls for calls like +// getChild<LLUICtrl>("not-there") +//static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); +// This doesn't appear to read/apply ui_ctrl.xml +static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl"); LLUICtrl::Params::Params() : tab_stop("tab_stop", true), |