diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 20:41:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 20:41:24 -0500 |
| commit | 9b1680927f474992d0f2f4313c7d7b9f730862f4 (patch) | |
| tree | a25a78684655a14188b5c18f59ad70154de22e0f /indra/llui/lluictrl.cpp | |
| parent | bcdd3c25b6bcfaac7849e9aad6fd6c9bb2da1e82 (diff) | |
| parent | 7eb8bb4ad18c313c178bb7977adee8e0044b14b7 (diff) | |
merge
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -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), |