EXT-490 Voice device settings unsaved

EXT-466 Statistics window is empty
EXT-488 Minimap does not open

6 files changed, 27 insertions, 8 deletions

diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
index 96948b659f..7e7d6ac111 100644
--- a/indra/llui/llcontainerview.cpp
+++ b/indra/llui/llcontainerview.cpp
@@ -42,7 +42,12 @@
 #include "llscrollcontainer.h"
 #include "lluictrlfactory.h"
 
-static LLDefaultChildRegistry::Register<LLContainerView> r("container_view");
+static LLDefaultChildRegistry::Register<LLContainerView> r1("container_view");
+
+#include "llpanel.h"
+#include "llstatview.h"
+static ContainerViewRegistry::Register<LLStatView> r2("stat_view");
+static ContainerViewRegistry::Register<LLPanel> r3("panel", &LLPanel::fromXML);
 
 LLContainerView::LLContainerView(const LLContainerView::Params& p)
 :	LLView(p),
diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h
index 9f3d1ac7ad..74e38e18bc 100644
--- a/indra/llui/llcontainerview.h
+++ b/indra/llui/llcontainerview.h
@@ -36,9 +36,13 @@
 #include "stdtypes.h"
 #include "lltextbox.h"
 #include "llstatbar.h"
+#include "llview.h"
 
 class LLScrollContainer;
 
+struct ContainerViewRegistry : public LLChildRegistry<ContainerViewRegistry>
+{};
+
 class LLContainerView : public LLView
 {
 public:
@@ -55,6 +59,10 @@ public:
 			mouse_opaque(false);
 		}
 	};
+
+	// my valid children are stored in this registry
+ 	typedef ContainerViewRegistry child_registry_t;
+	
 protected:
 	LLContainerView(const Params& p);
 	friend class LLUICtrlFactory;
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index 6f1572eda5..0b455f8e17 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -65,6 +65,13 @@ static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
 
 static LLDefaultChildRegistry::Register<LLScrollContainer> r("scroll_container");
 
+#include "llscrollingpanellist.h"
+#include "llcontainerview.h"
+#include "llpanel.h"
+static ScrollContainerRegistry::Register<LLScrollingPanelList> r1("scrolling_panel_list");
+static ScrollContainerRegistry::Register<LLContainerView> r2("container_view");
+static ScrollContainerRegistry::Register<LLPanel> r3("panel", &LLPanel::fromXML);
+
 LLScrollContainer::Params::Params()
 :	is_opaque("opaque"),
 	bg_color("color"),
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index ec4fb0d41f..912d126f23 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -53,6 +53,10 @@ class LLUICtrlFactory;
  * the width and height of the view you're scrolling.
  *
  *****************************************************************************/
+
+struct ScrollContainerRegistry : public LLChildRegistry<ScrollContainerRegistry>
+{};
+
 class LLScrollContainer : public LLUICtrl
 {
 public:
@@ -70,7 +74,7 @@ public:
 	};
 
 	// my valid children are stored in this registry
-	typedef LLDefaultChildRegistry child_registry_t;
+ 	typedef ScrollContainerRegistry child_registry_t;
 
 protected:
 	LLScrollContainer(const Params&);
diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
index ab4b0be97a..4ba01eb441 100644
--- a/indra/llui/llstatview.cpp
+++ b/indra/llui/llstatview.cpp
@@ -66,5 +66,6 @@ LLStatView::~LLStatView()
 
 
 static StatViewRegistry::Register<LLStatBar> r1("stat_bar");
+static StatViewRegistry::Register<LLStatView> r2("stat_view");
 
 
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 586b988c43..a4c9728402 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -84,12 +84,6 @@ LLFastTimer::DeclareTimer FTM_INIT_FROM_PARAMS("Widget InitFromParams");
 LLFastTimer::DeclareTimer FTM_WIDGET_SETUP("Widget Setup");
 
 //-----------------------------------------------------------------------------
-// Register widgets that are purely data driven here so they get linked in
-#include "llstatview.h"
-static LLDefaultChildRegistry::Register<LLStatView>
-	register_stat_view("stat_view");
-
-//-----------------------------------------------------------------------------
 
 // UI Ctrl class for padding
 class LLUICtrlLocate : public LLUICtrl