diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-08 10:47:25 -0400 |
commit | bb74487c859acccb8f88002630606419761136e4 (patch) | |
tree | eadeabd044a9fa06c789b957d9b2c823c47617dd /indra/integration_tests/llui_libtest/llwidgetreg.cpp | |
parent | 970ce1e1626c205302c4085610819571c1ce79f4 (diff) | |
parent | d25a30e55b7e6a20173c3a53891489adc5610d72 (diff) |
Merge fixes for VWR-23047, VWR-20911, and SNOW-748
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"); |