diff options
| author | James Cook <james@lindenlab.com> | 2009-11-13 09:10:41 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-13 09:10:41 -0800 |
| commit | 230f28080cfcb6785c248340aaa42cfb29703b23 (patch) | |
| tree | 7b58e0afa8e8ea192312efdba797467c8f629004 /indra/llui | |
| parent | e66fc02224062e631a816fa9ed8de62f7cb83f83 (diff) | |
| parent | 543fdfd512ae63a6a2e077c50027fc5ceb0a8e2a (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lluictrlfactory.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index aaadc1b58d..08fc8fb784 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -38,10 +38,6 @@ #include "llpanel.h" #include "lluictrlfactory.h" -// 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() diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index adfbb41feb..1c1450d7e9 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -433,8 +433,8 @@ void LLUICtrlFactory::registerWidget(const std::type_info* widget_type, const st LLWidgetNameRegistry ::instance().defaultRegistrar().add(param_block_type, tag); // associate widget type with factory function LLDefaultWidgetRegistry::instance().defaultRegistrar().add(widget_type, creator_func); - LLWidgetTypeRegistry::instance().defaultRegistrar().add(tag, widget_type); //FIXME: comment this in when working on schema generation + //LLWidgetTypeRegistry::instance().defaultRegistrar().add(tag, widget_type); //LLDefaultParamBlockRegistry::instance().defaultRegistrar().add(widget_type, &getEmptyParamBlock<T>); } |