1 files changed, 11 insertions, 11 deletions

diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 16170ac..559c8e5 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -50,44 +50,44 @@ public:
 
         void setupPaths();
 
-        void buildFloater(LLFloater* floaterp, const LLString &filename, 
+        void buildFloater(LLFloater* floaterp, const std::string &filename, 
                                         const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
-        BOOL buildPanel(LLPanel* panelp, const LLString &filename,
+        BOOL buildPanel(LLPanel* panelp, const std::string &filename,
                                         const LLCallbackMap::map_t* factory_map = NULL);
 
         void removePanel(LLPanel* panelp) { mBuiltPanels.erase(panelp->getHandle()); }
         void removeFloater(LLFloater* floaterp) { mBuiltFloaters.erase(floaterp->getHandle()); }
 
-        class LLMenuGL *buildMenu(const LLString &filename, LLView* parentp);
-        class LLPieMenu *buildPieMenu(const LLString &filename, LLView* parentp);
+        class LLMenuGL *buildMenu(const std::string &filename, LLView* parentp);
+        class LLPieMenu *buildPieMenu(const std::string &filename, LLView* parentp);
 
         // Does what you want for LLFloaters and LLPanels
         // Returns 0 on success
-        S32 saveToXML(LLView* viewp, const LLString& filename);
+        S32 saveToXML(LLView* viewp, const std::string& filename);
 
         // Rebuilds all currently built panels.
         void rebuild();
 
-        static BOOL getAttributeColor(LLXMLNodePtr node, const LLString& name, LLColor4& color);
+        static BOOL getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color);
 
-        LLPanel* createFactoryPanel(LLString name);
+        LLPanel* createFactoryPanel(const std::string& name);
 
         virtual LLView* createCtrlWidget(LLPanel *parent, LLXMLNodePtr node);
         virtual LLView* createWidget(LLPanel *parent, LLXMLNodePtr node);
 
-        static bool getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& root);
+        static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
 
 private:
 
-        typedef std::map<LLHandle<LLPanel>, LLString> built_panel_t;
+        typedef std::map<LLHandle<LLPanel>, std::string> built_panel_t;
         built_panel_t mBuiltPanels;
 
-        typedef std::map<LLHandle<LLFloater>, LLString> built_floater_t;
+        typedef std::map<LLHandle<LLFloater>, std::string> built_floater_t;
         built_floater_t mBuiltFloaters;
 
         std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
-        static std::vector<LLString> sXUIPaths;
+        static std::vector<std::string> sXUIPaths;
 
         LLPanel* mDummyPanel;
 };