diff options
author | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
commit | b9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (patch) | |
tree | 9886deac5d65ee1873e8c75ed2af62943c872f63 /indra/integration_tests | |
parent | 615cc856a8abf44f62c58962f8b53178f9708ee3 (diff) | |
parent | ccb3ad90001c2b19cbd690d67317651ee0182f42 (diff) |
Merge viewer-development -> mesh-development
Diffstat (limited to 'indra/integration_tests')
-rw-r--r-- | indra/integration_tests/llui_libtest/llwidgetreg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp index 0d0d9fbff6..cbf6021119 100644 --- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp +++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp @@ -49,6 +49,7 @@ #include "lltabcontainer.h" #include "lltextbox.h" #include "lltexteditor.h" +#include "lltimectrl.h" #include "llflyoutbutton.h" #include "llfiltereditor.h" #include "lllayoutstack.h" @@ -92,6 +93,7 @@ void LLWidgetReg::initClass(bool register_widgets) //LLDefaultChildRegistry::Register<LLPlaceHolderPanel> placeholder("placeholder"); LLDefaultChildRegistry::Register<LLTabContainer> tab_container("tab_container"); LLDefaultChildRegistry::Register<LLTextBox> text("text"); + LLDefaultChildRegistry::Register<LLTimeCtrl> time("time"); LLDefaultChildRegistry::Register<LLTextEditor> simple_text_editor("simple_text_editor"); LLDefaultChildRegistry::Register<LLUICtrl> ui_ctrl("ui_ctrl"); LLDefaultChildRegistry::Register<LLStatView> stat_view("stat_view"); |