Second Life viewer sources 1.21.0-RC

1 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index 00395e2..cb0d3b1 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -46,9 +46,9 @@
 extern BOOL gDebugClicks;
 
 //static
-const LLString LLTool::sNameNull("null");
+const std::string LLTool::sNameNull("null");
 
-LLTool::LLTool( const LLString& name, LLToolComposite* composite ) :
+LLTool::LLTool( const std::string& name, LLToolComposite* composite ) :
         mComposite( composite ),
         mName(name)
 {
@@ -124,7 +124,7 @@ BOOL LLTool::handleRightMouseUp(S32 x, S32 y, MASK mask)
         return FALSE;
 }
 
-BOOL LLTool::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
         // by default, didn't handle it
         // llinfos << "LLTool::handleToolTip" << llendl;
@@ -135,12 +135,12 @@ void LLTool::setMouseCapture( BOOL b )
 {
         if( b )
         {
-                gViewerWindow->setMouseCapture(mComposite ? mComposite : this );
+                gFocusMgr.setMouseCapture(mComposite ? mComposite : this );
         }
         else
         if( hasMouseCapture() )
         {
-                gViewerWindow->setMouseCapture( NULL );
+                gFocusMgr.setMouseCapture( NULL );
         }
 }