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.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llslider.cpp')
| -rw-r--r-- | indra/llui/llslider.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp index d53e957c9c..28058d0005 100644 --- a/indra/llui/llslider.cpp +++ b/indra/llui/llslider.cpp @@ -46,7 +46,7 @@ static LLRegisterWidget<LLSlider> r2("volume_slider"); LLSlider::LLSlider( - const LLString& name, + const std::string& name, const LLRect& rect, void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata), void* callback_userdata, @@ -55,7 +55,7 @@ LLSlider::LLSlider( F32 max_value, F32 increment, BOOL volume, - const LLString& control_name) + const std::string& control_name) : LLUICtrl( name, rect, TRUE, on_commit_callback, callback_userdata, FOLLOWS_LEFT | FOLLOWS_TOP), @@ -303,7 +303,7 @@ LLXMLNodePtr LLSlider::getXML(bool save_children) const //static LLView* LLSlider::fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory) { - LLString name("slider_bar"); + std::string name("slider_bar"); node->getAttributeString("name", name); LLRect rect; |