1 files changed, 4 insertions, 60 deletions

diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index e6a2cd3..b9325a0 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -41,7 +41,7 @@
 class LLView;
 class LLPanel;
 
-class LLUICtrlFactory
+class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
 {
 public:
         LLUICtrlFactory();
@@ -49,7 +49,7 @@ public:
         virtual ~LLUICtrlFactory() {}
 
         void setupPaths();
-        
+
         void buildFloater(LLFloater* floaterp, const LLString &filename, 
                                         const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
         BOOL buildPanel(LLPanel* panelp, const LLString &filename,
@@ -65,84 +65,28 @@ public:
         // Returns 0 on success
         S32 saveToXML(LLView* viewp, const LLString& filename);
 
-
         // Rebuilds all currently built panels.
         void rebuild();
 
-        static EWidgetType getWidgetType(const LLString& ctrl_type);
-        static LLString getWidgetType(EWidgetType ctrl_type);
         static BOOL getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color);
 
-        // specific typed getters
-        static class LLButton*                          getButtonByName(                const LLPanel* panelp, const LLString& name);
-        static class LLCheckBoxCtrl*            getCheckBoxByName(              const LLPanel* panelp, const LLString& name);
-        static class LLComboBox*                        getComboBoxByName(              const LLPanel* panelp, const LLString& name);
-        static class LLIconCtrl*                        getIconByName(                  const LLPanel* panelp, const LLString& name);
-        static class LLLineEditor*                      getLineEditorByName(    const LLPanel* panelp, const LLString& name);
-        static class LLRadioGroup*                      getRadioGroupByName(    const LLPanel* panelp, const LLString& name);
-        static class LLScrollListCtrl*          getScrollListByName(    const LLPanel* panelp, const LLString& name);
-        static class LLSliderCtrl*                      getSliderByName(                const LLPanel* panelp, const LLString& name);
-        static class LLSlider*                          getSliderBarByName(             const LLPanel* panelp, const LLString& name);
-        static class LLSpinCtrl*                        getSpinnerByName(               const LLPanel* panelp, const LLString& name);
-        static class LLTextBox*                         getTextBoxByName(               const LLPanel* panelp, const LLString& name);
-        static class LLTextEditor*                      getTextEditorByName(    const LLPanel* panelp, const LLString& name);
-        static class LLTabContainer*            getTabContainerByName(  const LLPanel* panelp, const LLString& name);
-        static class LLScrollableContainerView* getScrollableContainerByName(const LLPanel* panelp, const LLString& name);
-        static class LLPanel*                           getPanelByName(                 const LLPanel* panelp, const LLString& name);
-        static class LLMenuItemCallGL*          getMenuItemCallByName(  const LLPanel* panelp, const LLString& name);
-        static class LLScrollingPanelList*      getScrollingPanelList(  const LLPanel* panelp, const LLString& name);
-        static class LLMultiSliderCtrl*         getMultiSliderByName(   const LLPanel* panelp, const LLString& name);
-        static class LLMultiSlider*                     getMultiSliderBarByName(const LLPanel* panelp, const LLString& name);
-
-        // interface getters
-        static LLCtrlListInterface* getListInterfaceByName(     const LLPanel* panelp, const LLString& name);
-        static LLCtrlSelectionInterface* getSelectionInterfaceByName(const LLPanel* panelp, const LLString& name);
-        static LLCtrlScrollInterface* getScrollInterfaceByName(const LLPanel* panelp, const LLString& name);
-
         LLPanel* createFactoryPanel(LLString name);
 
         virtual LLView* createCtrlWidget(LLPanel *parent, LLXMLNodePtr node);
-        virtual void createWidget(LLPanel *parent, LLXMLNodePtr node);
-
-        template <class T> T* createDummyWidget(const LLString& name)
-        {
-                return NULL;
-                //static LLPanel dummy_panel;
-                //LLXMLNodePtr new_node_ptr = new LLXMLNode(T::getWidgetTag(), FALSE);
-                //return createWidget(&dummy_panel, new_node_ptr);
-        }
-
-        // Creator library
-        typedef LLView* (*creator_function_t)(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        void registerCreator(LLString ctrlname, creator_function_t function);
+        virtual LLView* createWidget(LLPanel *parent, LLXMLNodePtr node);
 
         static bool getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root);
 
-protected:
-
-        template<class T>
-        class LLUICtrlCreator
-        {
-        public:
-                static void registerCreator(LLString name, LLUICtrlFactory *factory)
-                {
-                        factory->registerCreator(name, T::fromXML);
-                }
-        };
-
 private:
 
         typedef std::map<LLHandle<LLPanel>, LLString> built_panel_t;
         built_panel_t mBuiltPanels;
+
         typedef std::map<LLHandle<LLFloater>, LLString> built_floater_t;
         built_floater_t mBuiltFloaters;
 
         std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
-        static const LLString sUICtrlNames[];
-
-        typedef std::map<LLString, creator_function_t> creator_list_t;
-        creator_list_t mCreatorFunctions;
         static std::vector<LLString> mXUIPaths;
 };