summaryrefslogtreecommitdiff
path: root/indra/llui/llspinctrl.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/llspinctrl.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llspinctrl.h')
-rw-r--r--indra/llui/llspinctrl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index eb9c60d442..1ed9462f00 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -52,13 +52,13 @@ class LLSpinCtrl
: public LLUICtrl
{
public:
- LLSpinCtrl(const LLString& name, const LLRect& rect,
- const LLString& label,
+ LLSpinCtrl(const std::string& name, const LLRect& rect,
+ const std::string& label,
const LLFontGL* font,
void (*commit_callback)(LLUICtrl*, void*),
void* callback_userdata,
F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- const LLString& control_name = LLString(),
+ const std::string& control_name = std::string(),
S32 label_width = SPINCTRL_DEFAULT_LABEL_WIDTH );
virtual ~LLSpinCtrl() {} // Children all cleaned up by default view destructor.