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

diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 44908fb..b4c8ff0 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -307,6 +307,22 @@ void *LLWindow::getMediaWindow()
         return getPlatformWindow();
 }
 
+//virtual
+BOOL LLWindow::isPrimaryTextAvailable()
+{
+        return FALSE; // no
+}
+//virtual
+BOOL LLWindow::pasteTextFromPrimary(LLWString &dst)
+{
+        return FALSE; // fail
+}
+// virtual
+BOOL LLWindow::copyTextToPrimary(const LLWString &src)
+{
+        return FALSE; // fail
+}
+
 // static
 std::string LLWindow::getFontListSans()
 {