Fix release merge issues (included upstream changes not yet in release from bear)

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index edc730ef14..182c5cfd8a 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -509,8 +509,8 @@ LLFloater::~LLFloater()
 	
 	if( gFocusMgr.childHasKeyboardFocus(this))
 	{
-		// Just in case we might still have focus here, release it.
-		releaseFocus();
+	// Just in case we might still have focus here, release it.
+	releaseFocus();
 	}
 
 	// This is important so that floaters with persistent rects (i.e., those
@@ -1821,7 +1821,7 @@ void LLFloater::onClickClose( LLFloater* self )
 	self->onClickCloseBtn();
 }
 
-void LLFloater::onClickCloseBtn(bool app_quitting)
+void	LLFloater::onClickCloseBtn()
 {
 	closeFloater(false);
 }