1 files changed, 15 insertions, 1 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index b2a1ccf..0c5d6ed 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2177,6 +2177,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseDown(this, outCoords, mask);
                                                 break;
+                                        
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseDown(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2199,6 +2203,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
                                         case kEventMouseButtonSecondary:
                                                 mCallbacks->handleRightMouseUp(this, outCoords, mask);
                                                 break;
+
+                                        case kEventMouseButtonTertiary:
+                                                mCallbacks->handleMiddleMouseUp(this, outCoords, mask);
+                                                break;
                                         }
                                         result = noErr;
                                         break;
@@ -2231,7 +2239,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;