diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 17:51:37 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-27 17:51:37 +0100 |
commit | ec935189b62b77e5e544b575531d69b6916f4cc5 (patch) | |
tree | a31e18cf83dcbc6c79ae7b1049cfa04a7270ab6c /indra/integration_tests | |
parent | c05cfcae3f8b2f3b8aca7584b2872ee11aeea921 (diff) | |
parent | 42aa72cd99b68698861c8bcbb555d2c2cf136f9d (diff) |
merge from viewer-trunk
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 c6e2e79a09..57c39243fb 100644 --- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp +++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp @@ -37,6 +37,7 @@ #include "llcombobox.h" #include "llcontainerview.h" #include "lliconctrl.h" +#include "llloadingindicator.h" #include "llmenubutton.h" #include "llmenugl.h" #include "llmultislider.h" @@ -72,6 +73,7 @@ void LLWidgetReg::initClass(bool register_widgets) LLDefaultChildRegistry::Register<LLFlyoutButton> flyout_button("flyout_button"); LLDefaultChildRegistry::Register<LLContainerView> container_view("container_view"); LLDefaultChildRegistry::Register<LLIconCtrl> icon("icon"); + LLDefaultChildRegistry::Register<LLLoadingIndicator> loading_indicator("loading_indicator"); LLDefaultChildRegistry::Register<LLLineEditor> line_editor("line_editor"); LLDefaultChildRegistry::Register<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator"); LLDefaultChildRegistry::Register<LLMenuItemCallGL> menu_item_call_gl("menu_item_call"); |