Second Life viewer sources 1.21.0-RC

1 files changed, 2 insertions, 2 deletions

diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 1c9d5e1..b963beb 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -41,7 +41,7 @@ class LLSlider : public LLUICtrl
 {
 public:
         LLSlider( 
-                const LLString& name,
+                const std::string& name,
                 const LLRect& rect,
                 void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
                 void* callback_userdata,
@@ -50,7 +50,7 @@ public:
                 F32 max_value,
                 F32 increment,
                 BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no?  -MG
-                const LLString& control_name = LLString::null );
+                const std::string& control_name = LLStringUtil::null );
 
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static  LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);