diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
commit | db3991ca235f3ceefe888d03758cac5eccf1b552 (patch) | |
tree | c4712870f33c4b0fdcc13959ba2f940aa396b6b2 /indra/llui/lluictrl.cpp | |
parent | 2fd51b4c711aa7ab70da6d7e7dfcb380b87cbedf (diff) | |
parent | b34ee7f9f405e25ac606a16435ed49c7187387d8 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lluictrl.cpp')
-rw-r--r-- | indra/llui/lluictrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 08fc8fb784..dd807a3f7e 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -38,7 +38,7 @@ #include "llpanel.h" #include "lluictrlfactory.h" -static LLDefaultChildRegistry::Register<LLUICtrl> r("ui_ctrl"); +static LLWidgetNameRegistry::StaticRegistrar r(&typeid(LLUICtrl::Params), "ui_ctrl"); LLUICtrl::Params::Params() : tab_stop("tab_stop", true), |