diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-10-19 13:47:15 -0700 |
commit | 42e397e155239932a75fa694dc77d9dd952e3c09 (patch) | |
tree | 1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/integration_tests/llui_libtest/llwidgetreg.cpp | |
parent | a63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff) | |
parent | c683151587067cb2758206432610d4ff4884036e (diff) |
Merged from 2.3.0-beta1 tag in viewer-development
Diffstat (limited to 'indra/integration_tests/llui_libtest/llwidgetreg.cpp')
-rw-r--r-- | indra/integration_tests/llui_libtest/llwidgetreg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp index b4921faece..0d0d9fbff6 100644 --- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp +++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp @@ -78,7 +78,7 @@ void LLWidgetReg::initClass(bool register_widgets) LLDefaultChildRegistry::Register<LLMultiSlider> multi_slider_bar("multi_slider_bar"); LLDefaultChildRegistry::Register<LLMultiSliderCtrl> multi_slider("multi_slider"); LLDefaultChildRegistry::Register<LLPanel> panel("panel", &LLPanel::fromXML); - LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack", &LLLayoutStack::fromXML); + LLDefaultChildRegistry::Register<LLLayoutStack> layout_stack("layout_stack"); LLDefaultChildRegistry::Register<LLProgressBar> progress_bar("progress_bar"); LLDefaultChildRegistry::Register<LLRadioGroup> radio_group("radio_group"); LLDefaultChildRegistry::Register<LLSearchEditor> search_editor("search_editor"); |