Second Life viewer sources 1.15.0.2

1 files changed, 8 insertions, 9 deletions

diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index 5687b99..e189945 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -46,7 +47,7 @@ public:
         ~LLFocusMgr();
 
         // Mouse Captor
-        void                    setMouseCapture(LLMouseHandler* new_captor,void (*on_capture_lost)(LLMouseHandler* old_captor));        // new_captor = NULL to release the mouse.
+        void                    setMouseCapture(LLMouseHandler* new_captor);    // new_captor = NULL to release the mouse.
         LLMouseHandler* getMouseCapture() { return mMouseCaptor; } 
         void                    removeMouseCaptureWithoutCallback( LLMouseHandler* captor );
         BOOL                    childHasMouseCapture( LLView* parent );
@@ -73,10 +74,10 @@ public:
 
         
         // Top View
-        void                    setTopView(LLView* new_top, void (*on_top_lost)(LLView* old_top));
-        LLView*                 getTopView() const                                      { return mTopView; }
-        void                    removeTopViewWithoutCallback( LLView* top_view );
-        BOOL                    childIsTopView( LLView* parent );
+        void                    setTopCtrl(LLUICtrl* new_top);
+        LLUICtrl*               getTopCtrl() const                                      { return mTopCtrl; }
+        void                    removeTopCtrlWithoutCallback( LLUICtrl* top_view );
+        BOOL                    childIsTopCtrl( LLView* parent );
 
         // All Three
         void                    releaseFocusIfNeeded( LLView* top_view );
@@ -89,7 +90,6 @@ protected:
 
         // Mouse Captor
         LLMouseHandler*         mMouseCaptor;                           // Mouse events are premptively routed to this object
-        void                            (*mMouseCaptureLostCallback)(LLMouseHandler*);  // The object to which mouse events are routed is called before another object takes its place
 
         // Keyboard Focus
         LLUICtrl*                       mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
@@ -97,8 +97,7 @@ protected:
         FocusLostCallback       mKeyboardFocusLostCallback;     // The object to which keyboard events are routed is called before another object takes its place
 
         // Top View
-        LLView*                         mTopView;
-        void                            (*mTopViewLostCallback)(LLView*);
+        LLUICtrl*                       mTopCtrl;
 
         LLFrameTimer            mFocusTimer;
         F32                                     mFocusWeight;
@@ -111,7 +110,7 @@ protected:
         #ifdef _DEBUG
                 LLString                mMouseCaptorName;
                 LLString                mKeyboardFocusName;
-                LLString                mTopViewName;
+                LLString                mTopCtrlName;
         #endif
 };