diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llui/llslider.h | 4 |
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 | |||
41 | { | 41 | { |
42 | public: | 42 | public: |
43 | LLSlider( | 43 | LLSlider( |
44 | const LLString& name, | 44 | const std::string& name, |
45 | const LLRect& rect, | 45 | const LLRect& rect, |
46 | void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata), | 46 | void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata), |
47 | void* callback_userdata, | 47 | void* callback_userdata, |
@@ -50,7 +50,7 @@ public: | |||
50 | F32 max_value, | 50 | F32 max_value, |
51 | F32 increment, | 51 | F32 increment, |
52 | BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG | 52 | BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG |
53 | const LLString& control_name = LLString::null ); | 53 | const std::string& control_name = LLStringUtil::null ); |
54 | 54 | ||
55 | virtual LLXMLNodePtr getXML(bool save_children = true) const; | 55 | virtual LLXMLNodePtr getXML(bool save_children = true) const; |
56 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory); | 56 | static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory); |