svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 4eaf6b7559..4453767f92 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -65,8 +65,8 @@ void LLModalDialog::startModal()
 		}
 	
 		// This is a modal dialog.  It sucks up all mouse and keyboard operations.
-		gFocusMgr.setMouseCapture( this, NULL );
-		gFocusMgr.setTopView( this, NULL );
+		gFocusMgr.setMouseCapture( this );
+		gFocusMgr.setTopCtrl( this );
 		setFocus(TRUE);
 
 		sModalStack.push_front( this );
@@ -107,10 +107,10 @@ void LLModalDialog::setVisible( BOOL visible )
 		if( visible )
 		{
 			// This is a modal dialog.  It sucks up all mouse and keyboard operations.
-			gFocusMgr.setMouseCapture( this, NULL );
+			gFocusMgr.setMouseCapture( this );
 
 			// The dialog view is a root view
-			gFocusMgr.setTopView( this, NULL );
+			gFocusMgr.setTopCtrl( this );
 			setFocus( TRUE );
 		}
 		else
@@ -222,9 +222,9 @@ void LLModalDialog::draw()
 		if (mModal)
 		{
 			// If we've lost focus to a non-child, get it back ASAP.
-			if( gFocusMgr.getTopView() != this )
+			if( gFocusMgr.getTopCtrl() != this )
 			{
-				gFocusMgr.setTopView( this, NULL);
+				gFocusMgr.setTopCtrl( this );
 			}
 
 			if( !gFocusMgr.childHasKeyboardFocus( this ) )
@@ -234,7 +234,7 @@ void LLModalDialog::draw()
 
 			if( !gFocusMgr.childHasMouseCapture( this ) )
 			{
-				gFocusMgr.setMouseCapture( this, NULL );
+				gFocusMgr.setMouseCapture( this );
 			}
 		}
 	}
@@ -259,7 +259,7 @@ void LLModalDialog::onAppFocusLost()
 		LLModalDialog* instance = LLModalDialog::sModalStack.front();
 		if( gFocusMgr.childHasMouseCapture( instance ) )
 		{
-			gFocusMgr.setMouseCapture( NULL, NULL );
+			gFocusMgr.setMouseCapture( NULL );
 		}
 
 		if( gFocusMgr.childHasKeyboardFocus( instance ) )
@@ -277,9 +277,9 @@ void LLModalDialog::onAppFocusGained()
 		LLModalDialog* instance = LLModalDialog::sModalStack.front();
 
 		// This is a modal dialog.  It sucks up all mouse and keyboard operations.
-		gFocusMgr.setMouseCapture( instance, NULL );
+		gFocusMgr.setMouseCapture( instance );
 		instance->setFocus(TRUE);
-		gFocusMgr.setTopView( instance, NULL );
+		gFocusMgr.setTopCtrl( instance );
 
 		instance->centerOnScreen();
 	}