Second Life viewer sources 1.17.1.0

1 files changed, 7 insertions, 5 deletions

diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 3b3bbef..34fff9c 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -35,6 +35,7 @@
 #endif
 #include "stdenums.h"
 #include "llcoord.h"
+#include "llscrollbar.h"
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLScrollableContainerView
@@ -47,7 +48,6 @@
 // This class is a decorator class.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-class LLScrollbar;
 class LLViewBorder;
 class LLUICtrlFactory;
 
@@ -55,6 +55,10 @@ class LLUICtrlFactory;
 class LLScrollableContainerView : public LLUICtrl
 {
 public:
+        // Note: vertical comes before horizontal because vertical
+        // scrollbars have priority for mouse and keyboard events.
+        enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
+
         LLScrollableContainerView( const LLString& name, const LLRect& rect,
                                                            LLView* scrolled_view, BOOL is_opaque = FALSE,
                                                            const LLColor4& bg_color = LLColor4(0,0,0,0) );
@@ -88,6 +92,8 @@ public:
         void                    goToBottom();
         S32                             getBorderWidth();
 
+        BOOL                    needsToScroll(S32 x, S32 y, SCROLL_ORIENTATION axis);
+
         // LLView functionality
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent);
         virtual BOOL    handleKey(KEY key, MASK mask, BOOL called_from_parent);
@@ -110,10 +116,6 @@ protected:
         virtual void scrollVertical( S32 new_pos );
         void updateScroll();
 
-        // Note: vertical comes before horizontal because vertical
-        // scrollbars have priority for mouse and keyboard events.
-        enum { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
-
         LLScrollbar* mScrollbar[SCROLLBAR_COUNT];
         LLView*         mScrolledView;
         S32                     mSize;