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/llfocusmgr.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llfocusmgr.cpp')
| -rw-r--r-- | indra/llui/llfocusmgr.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp index 621b01ad82..fce84eb2e8 100644 --- a/indra/llui/llfocusmgr.cpp +++ b/indra/llui/llfocusmgr.cpp @@ -120,7 +120,7 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock, BOOL keystroke mFocusTimer.reset(); #ifdef _DEBUG - mKeyboardFocusName = new_focus ? new_focus->getName() : "none"; + mKeyboardFocusName = new_focus ? new_focus->getName() : std::string("none"); #endif // If we've got a default keyboard focus, and the caller is @@ -202,7 +202,7 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( const LLView* focus ) { mKeyboardFocus = NULL; #ifdef _DEBUG - mKeyboardFocusName = "none"; + mKeyboardFocusName = std::string("none"); #endif } } @@ -243,7 +243,7 @@ void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor ) } #ifdef _DEBUG - mMouseCaptorName = new_captor ? new_captor->getName() : "none"; + mMouseCaptorName = new_captor ? new_captor->getName() : std::string("none"); #endif } } @@ -258,7 +258,7 @@ void LLFocusMgr::removeMouseCaptureWithoutCallback( const LLMouseHandler* captor { mMouseCaptor = NULL; #ifdef _DEBUG - mMouseCaptorName = "none"; + mMouseCaptorName = std::string("none"); #endif } } @@ -289,7 +289,7 @@ void LLFocusMgr::setTopCtrl( LLUICtrl* new_top ) mTopCtrl = new_top; #ifdef _DEBUG - mTopCtrlName = new_top ? new_top->getName() : "none"; + mTopCtrlName = new_top ? new_top->getName() : std::string("none"); #endif if (old_top) @@ -305,7 +305,7 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( const LLUICtrl* top_view ) { mTopCtrl = NULL; #ifdef _DEBUG - mTopCtrlName = "none"; + mTopCtrlName = std::string("none"); #endif } } |