From 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Wed, 30 May 2007 17:39:09 +0000
Subject: merge -r61423:62602 svn/branches/maintenance --> release

---
 indra/llwindow/llwindowmacosx.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/llwindow/llwindowmacosx.cpp')

diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index bc02ebfb63..4152de51c5 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -2211,7 +2211,13 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
 	case kEventClassWindow:
 		switch(evtKind)
-		{
+		{		
+		case kEventWindowActivated:
+			mCallbacks->handleFocus(this);
+			break;
+		case kEventWindowDeactivated:
+			mCallbacks->handleFocusLost(this);
+			break;
 		case kEventWindowBoundsChanging:
 			{
 				Rect currentBounds;
-- 
cgit v1.2.3