diff options
| author | James Cook <james@lindenlab.com> | 2009-11-11 10:56:37 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-11 10:56:37 -0800 |
| commit | 41a2849a2075f8c5b787e7ed5ac170aa9a339e19 (patch) | |
| tree | beb5d95d16a69af80423762636d8751a39dd8f97 /indra/llui | |
| parent | d4846af9fbd4a8b78071724d6e04cef70a982a81 (diff) | |
| parent | a758a799cf79056470dde92c32ea88f2807dfac2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui')
| -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), |