1 files changed, 93 insertions, 5 deletions

diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 9cdf481..e3652b7 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -85,7 +85,8 @@ LLView::LLView() :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -102,7 +103,8 @@ LLView::LLView(const std::string& name, BOOL mouse_opaque) :
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -123,7 +125,8 @@ LLView::LLView(
         mLastVisible(TRUE),
         mUseBoundingRect(FALSE),
         mVisible(TRUE),
-        mNextInsertionOrdinal(0)
+        mNextInsertionOrdinal(0),
+        mHoverCursor(UI_CURSOR_ARROW)
 {
 }
 
@@ -657,7 +660,7 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
         if( !handled 
                 && blockMouseEvent(x, y) )
         {
-                LLUI::sWindow->setCursor(UI_CURSOR_ARROW);
+                LLUI::sWindow->setCursor(mHoverCursor);
                 lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
                 handled = TRUE;
         }
@@ -981,6 +984,30 @@ BOOL LLView::handleRightMouseUp(S32 x, S32 y, MASK mask)
         }
         return handled;
 }
+ 
+BOOL LLView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = childrenHandleMiddleMouseDown( x, y, mask );
+        BOOL handled = (handled_view != NULL);
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+                handled_view = this;
+        }
+
+        return handled;
+}
+
+BOOL LLView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        BOOL handled = childrenHandleMiddleMouseUp( x, y, mask ) != NULL;
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+        }
+        return handled;
+}
+
 
 LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
 {
@@ -1142,6 +1169,34 @@ LLView* LLView::childrenHandleRightMouseDown(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+
+        if (getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseDown( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
+
 LLView* LLView::childrenHandleDoubleClick(S32 x, S32 y, MASK mask)
 {
         LLView* handled_view = NULL;
@@ -1227,6 +1282,32 @@ LLView* LLView::childrenHandleRightMouseUp(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+        if( getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseUp( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
 
 void LLView::draw()
 {
@@ -2544,7 +2625,14 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
                 node->getAttributeBOOL("visible", visible);
                 setVisible(visible);
         }
-        
+
+        if (node->hasAttribute("hover_cursor"))
+        {
+                std::string cursor_string;
+                node->getAttributeString("hover_cursor", cursor_string);
+                mHoverCursor = getCursorFromString(cursor_string);
+        }
+
         node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
         node->getAttributeBOOL("mouse_opaque", mMouseOpaque);