diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/llslider.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llslider.h')
| -rw-r--r-- | indra/llui/llslider.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h index ba0fac1465..a0fa543e98 100644 --- a/indra/llui/llslider.h +++ b/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); |