1 files changed, 39 insertions, 47 deletions

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 46908f5..5e131b9 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -96,6 +96,13 @@ public:
                 }
                 else
                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+                        {
+                                return;
+                        }
+// [/RLVa:KB]
+
                         // See if we can bring an existing preview to the front
                         if(!LLPreview::show(item->getUUID(), true))
                         {
@@ -896,51 +903,9 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-        BOOL    handled = FALSE;
-
-        // let scrollbar have first dibs
-        handled = LLView::childrenHandleMouseUp(x, y, mask) != NULL;
-
-        // Used to enable I Agree checkbox if the user scrolled through entire text
-        BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
-        if (mOnScrollEndCallback && was_scrolled_to_bottom)
-        {
-                mOnScrollEndCallback(mOnScrollEndData);
-        }
-
-        if( !handled && mTakesNonScrollClicks)
-        {
-                if( mIsSelecting )
-                {
-                        // Finish selection
-                        if( y > getTextRect().mTop )
-                        {
-                                mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-                        }
-                        else
-                        if( y < getTextRect().mBottom )
-                        {
-                                mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-                        }
-                        
-                        setCursorAtLocalPos( x, y, TRUE );
-                        endSelection();
-
-                        updateScrollFromCursor();
-                }
-                
-                if( !hasSelection() )
-                {
-                        handleMouseUpOverSegment( x, y, mask );
-                }
-
-                handled = TRUE;
-        }
-
-        // Delay cursor flashing
-        resetKeystrokeTimer();
+        BOOL handled = FALSE;
 
-        if( hasMouseCapture()  )
+        if( hasMouseCapture() )
         {
                 if (mDragItem)
                 {
@@ -960,8 +925,15 @@ BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         }
                 }
                 mDragItem = NULL;
-                gFocusMgr.setMouseCapture( NULL );
-                handled = TRUE;
+        }
+
+        handled = LLTextEditor::handleMouseUp(x,y,mask);
+
+        // Used to enable I Agree checkbox if the user scrolled through entire text
+        BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
+        if (mOnScrollEndCallback && was_scrolled_to_bottom)
+        {
+                mOnScrollEndCallback(mOnScrollEndData);
         }
 
         return handled;
@@ -1003,6 +975,24 @@ BOOL LLViewerTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return handled;
 }
 
+BOOL LLViewerTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        BOOL    handled = FALSE;
+        handled = childrenHandleMiddleMouseDown(x, y, mask) != NULL;
+        if (!handled)
+        {
+                handled = LLTextEditor::handleMiddleMouseDown(x, y, mask);
+        }
+        return handled;
+}
+
+BOOL LLViewerTextEditor::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        BOOL handled = childrenHandleMiddleMouseUp(x, y, mask) != NULL;
+
+        return handled;
+}
+
 BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         BOOL    handled = FALSE;
@@ -1025,7 +1015,6 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                                 }
                         }
                 }
-
         
                 setCursorAtLocalPos( x, y, FALSE );
                 deselect();
@@ -1063,6 +1052,9 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                 // delay cursor flashing
                 resetKeystrokeTimer();
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
         return handled;