Merge remote branch 'mccabe/1.2.0-next' into next

Moved "Backup" pie menu item to fit "Go Here" in top-left slot.

Conflicts:
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml

1 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/llui/llclipboard.h b/linden/indra/llui/llclipboard.h
index 706ed2a..7117f84 100644
--- a/linden/indra/llui/llclipboard.h
+++ b/linden/indra/llui/llclipboard.h
@@ -43,10 +43,19 @@ public:
         LLClipboard();
         ~LLClipboard();
 
+        /* We support two flavors of clipboard.  The default is the explicitly
+           copy-and-pasted clipboard.  The second is the so-called 'primary' clipboard
+           which is implicitly copied upon selection on platforms which expect this
+           (i.e. X11/Linux). */
+
         void            copyFromSubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
         BOOL            canPasteString() const;
         const LLWString&        getPasteWString(LLUUID* source_id = NULL);
-        
+
+        void            copyFromPrimarySubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
+        BOOL            canPastePrimaryString() const;
+        const LLWString&        getPastePrimaryWString(LLUUID* source_id = NULL);       
+
 private:
         LLUUID          mSourceID;
         LLWString       mString;