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/llui/llui.cpp | |
| parent | c05cfcae3f8b2f3b8aca7584b2872ee11aeea921 (diff) | |
| parent | 42aa72cd99b68698861c8bcbb555d2c2cf136f9d (diff) | |
merge from viewer-trunk
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index f9a4ed7285..bf12384a28 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -56,6 +56,7 @@ #include "llfloaterreg.h" #include "llmenugl.h" #include "llmenubutton.h" +#include "llloadingindicator.h" #include "llwindow.h" // for registration @@ -94,7 +95,10 @@ std::list<std::string> gUntranslated; static LLDefaultChildRegistry::Register<LLFilterEditor> register_filter_editor("filter_editor"); static LLDefaultChildRegistry::Register<LLFlyoutButton> register_flyout_button("flyout_button"); static LLDefaultChildRegistry::Register<LLSearchEditor> register_search_editor("search_editor"); + +// register other widgets which otherwise may not be linked in static LLDefaultChildRegistry::Register<LLMenuButton> register_menu_button("menu_button"); +static LLDefaultChildRegistry::Register<LLLoadingIndicator> register_loading_indicator("loading_indicator"); // |