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/lluictrl.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/lluictrl.cpp')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index aa44663fd0..c01845e524 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -98,7 +98,7 @@ LLUICtrl::LLUICtrl() : { } -LLUICtrl::LLUICtrl(const LLString& name, const LLRect& rect, BOOL mouse_opaque, +LLUICtrl::LLUICtrl(const std::string& name, const LLRect& rect, BOOL mouse_opaque, void (*on_commit_callback)(LLUICtrl*, void*), void* callback_userdata, U32 reshape) @@ -147,13 +147,13 @@ LLSD LLUICtrl::getValue() const } // virtual -BOOL LLUICtrl::setTextArg( const LLString& key, const LLStringExplicit& text ) +BOOL LLUICtrl::setTextArg( const std::string& key, const LLStringExplicit& text ) { return FALSE; } // virtual -BOOL LLUICtrl::setLabelArg( const LLString& key, const LLStringExplicit& text ) +BOOL LLUICtrl::setLabelArg( const std::string& key, const LLStringExplicit& text ) { return FALSE; } @@ -495,7 +495,7 @@ LLUICtrl* LLUICtrl::findRootMostFocusRoot() const /* // Don't let the children handle the tool tip. Handle it here instead. -BOOL LLUICtrl::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen) +BOOL LLUICtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) { BOOL handled = FALSE; if (getVisible() && pointInView( x, y ) ) |