From 96830697b2f3bb8d1d7e1c4a3a6872845a38926c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Mon, 10 Sep 2007 20:15:48 +0000
Subject: SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickers
 revamp.

Passed by QA.  Reviewed by bos.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938
-> release
---
 indra/llwindow/llwindowsdl.cpp | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

(limited to 'indra/llwindow')

diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 501e9119fb..86c9e8fdc6 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2005,20 +2005,16 @@ void LLWindowSDL::gatherInput()
 			SDLReallyCaptureInput(TRUE);
 
                 if (event.key.keysym.unicode)
-				{
-					handleUnicodeUTF16(event.key.keysym.unicode,
-									   gKeyboard->currentMask(FALSE));
-				}
+		{
+			handleUnicodeUTF16(event.key.keysym.unicode,
+					   gKeyboard->currentMask(FALSE));
+		}
                 break;
 
             case SDL_KEYUP:
 		if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0)
 			SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243
 
-		// This is a testing hack to pop up a dialog when 4 is pressed
-		//if (event.key.keysym.sym == SDLK_4)
-		//OSMessageBox("a whole bunch of text goes right here, whee!  test test test.", "this is the title!", OSMB_YESNO);
-
 		gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
                 break;
 
@@ -2099,9 +2095,9 @@ void LLWindowSDL::gatherInput()
                 else if (event.button.button == SDL_BUTTON_RIGHT)  // right ... yes, it's 3, not 2, in SDL...
 				    mCallbacks->handleRightMouseUp(this, openGlCoord, mask);
                 else if (event.button.button == SDL_BUTTON_MIDDLE)  // middle
-				{
-					mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
-				}
+		{
+			mCallbacks->handleMiddleMouseUp(this, openGlCoord, mask);
+		}
                 // don't handle mousewheel here...
 
                 break;
@@ -2155,18 +2151,18 @@ void LLWindowSDL::gatherInput()
                 }
                 if (event.active.state & SDL_APPACTIVE)
                 {
-					// Change in iconification/minimization state.
-					if ((!event.active.gain) != mIsMinimized)
-					{
-						mCallbacks->handleActivate(this, !!event.active.gain);
-						llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
-			
-						mIsMinimized = (!event.active.gain);
-					}
-					else
-					{
-						llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl;
-					}
+			// Change in iconification/minimization state.
+			if ((!event.active.gain) != mIsMinimized)
+			{
+				mCallbacks->handleActivate(this, !!event.active.gain);
+				llinfos << "SDL deiconification state switched to " << BOOL(event.active.gain) << llendl;
+	
+				mIsMinimized = (!event.active.gain);
+			}
+			else
+			{
+				llinfos << "Ignored bogus redundant SDL deiconification state switch to " << BOOL(event.active.gain) << llendl;
+			}
                 }
                 break;
 
-- 
cgit v1.2.3