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, 41 insertions, 0 deletions

diff --git a/linden/indra/llui/llclipboard.cpp b/linden/indra/llui/llclipboard.cpp
index d5255e7..f33f3fa 100644
--- a/linden/indra/llui/llclipboard.cpp
+++ b/linden/indra/llui/llclipboard.cpp
@@ -92,3 +92,44 @@ BOOL LLClipboard::canPasteString() const
 {
         return LLView::getWindow()->isClipboardTextAvailable();
 }
+
+
+void LLClipboard::copyFromPrimarySubstring(const LLWString &src, S32 pos, S32 len, const LLUUID& source_id )
+{
+        mSourceID = source_id;
+        mString = src.substr(pos, len);
+        LLView::getWindow()->copyTextToPrimary( mString );
+}
+
+
+const LLWString& LLClipboard::getPastePrimaryWString( LLUUID* source_id )
+{
+        if( mSourceID.notNull() )
+        {
+                LLWString temp_string;
+                LLView::getWindow()->pasteTextFromPrimary(temp_string);
+
+                if( temp_string != mString )
+                {
+                        mSourceID.setNull();
+                        mString = temp_string;
+                }
+        }
+        else
+        {
+                LLView::getWindow()->pasteTextFromPrimary(mString);
+        }
+
+        if( source_id )
+        {
+                *source_id = mSourceID;
+        }
+
+        return mString;
+}
+
+
+BOOL LLClipboard::canPastePrimaryString() const
+{
+        return LLView::getWindow()->isPrimaryTextAvailable();
+}