Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index cc12aa1..a670b21 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -90,6 +90,7 @@ public:
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x,S32 y,MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseDown(S32 x,S32 y,MASK mask);
         /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask );
         /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
         /*virtual*/ void        onMouseCaptureLost();
@@ -97,13 +98,16 @@ public:
         // LLEditMenuHandler overrides
         virtual void    cut();
         virtual BOOL    canCut() const;
-
         virtual void    copy();
         virtual BOOL    canCopy() const;
-
         virtual void    paste();
         virtual BOOL    canPaste() const;
-        
+
+        virtual void    updatePrimary();
+        virtual void    copyPrimary();
+        virtual void    pastePrimary();
+        virtual BOOL    canPastePrimary() const;
+
         virtual void    doDelete();
         virtual BOOL    canDoDelete() const;
 
@@ -220,6 +224,9 @@ public:
         
 private:
         // private helper methods
+
+        void                    pasteHelper(bool is_primary);
+
         void                    removeChar();
         void                    addChar(const llwchar c);
         void                    setCursorAtLocalPos(S32 local_mouse_x);