From 6cd617a60dfb4cd491da495a4e4f5c0285f95a95 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 2 Mar 2013 01:46:18 +0000
Subject: ACME-73 FIX Add a button in the viewer to show FB login page Added a
 menu item Develop > UI > FB Connect Test that pops up a browser window set to
 https://cryptic-ridge-1632.herokuapp.com/

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 18932a32d0..ac42137925 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2917,6 +2917,13 @@
              function="Advanced.WebContentTest"
              parameter="http://google.com"/>
           </menu_item_call>
+          <menu_item_call
+           label="FB Connect Test"
+           name="FB Connect Test">
+            <menu_item_call.on_click
+             function="Advanced.WebContentTest"
+             parameter="https://cryptic-ridge-1632.herokuapp.com/"/>
+          </menu_item_call>
           <menu_item_call
              label="Dump SelectMgr"
              name="Dump SelectMgr">
-- 
cgit v1.2.3


From 54de882b81083298009e3b4a3d74fa1c7255068d Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 7 May 2013 13:47:18 -0700
Subject: ACME-343 : Add Connect to Facebook menu item

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 39e777b246..9ce360415c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,6 +15,13 @@
          function="ShowAgentProfile"
          parameter="agent" />
       </menu_item_call>
+      <menu_item_call
+        label="Connect to Facebook..."
+        name="ConnectToFacebook">
+        <menu_item_call.on_click
+          function="People.loginFBC" />
+      </menu_item_call>
+      <menu_item_separator/>
       <menu_item_call
        label="Appearance..."
        name="ChangeOutfit">
-- 
cgit v1.2.3


From dbef09a2bb629cf6001a3963f6899bcac53b7774 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 13 May 2013 18:29:28 -0700
Subject: ACME-344 : Menu hooked up. Readded the missing completedHeader()
 methods in responder that I mistakenly took out during the refactor.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 9ce360415c..b34816fb14 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -19,7 +19,7 @@
         label="Connect to Facebook..."
         name="ConnectToFacebook">
         <menu_item_call.on_click
-          function="People.loginFBC" />
+          function="Facebook.Connect" />
       </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
-- 
cgit v1.2.3


From abcb3e85628712da4d61fda6e68bb86a29e1f965 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Tue, 4 Jun 2013 18:39:41 -0700
Subject: ACME-471: Once connected to facebook, a user can use the 'Check in to
 Facebook' button under the 'Me' menu to make a check in post to Facebook

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b34816fb14..5061842c7f 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -21,6 +21,12 @@
         <menu_item_call.on_click
           function="Facebook.Connect" />
       </menu_item_call>
+      <menu_item_call
+        label="Check in to Facebook"
+        name="CheckinToFacebook">
+        <menu_item_call.on_click
+          function="Facebook.Checkin" />
+      </menu_item_call>      
       <menu_item_separator/>
       <menu_item_call
        label="Appearance..."
-- 
cgit v1.2.3


From ba90e388855f99ec5b3f1991f2437f616a5d9e62 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 5 Jun 2013 19:40:33 -0700
Subject: ACME-464 : WIP : Make the menu Connect to FB only connect and be
 disabled if the user is already connected

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5061842c7f..e67350722d 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -20,6 +20,8 @@
         name="ConnectToFacebook">
         <menu_item_call.on_click
           function="Facebook.Connect" />
+        <menu_item_call.on_enable
+          function="Facebook.EnableConnect" />
       </menu_item_call>
       <menu_item_call
         label="Check in to Facebook"
-- 
cgit v1.2.3


From 5020579a07eca7a719f70b2ae7fde40a2522f124 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 7 Jun 2013 12:34:57 -0700
Subject: ACME-470: Adjusting 'Check in to Facebook' text to 'Check in to
 Facebook...'

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5061842c7f..97cd01123f 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -22,7 +22,7 @@
           function="Facebook.Connect" />
       </menu_item_call>
       <menu_item_call
-        label="Check in to Facebook"
+        label="Check in to Facebook..."
         name="CheckinToFacebook">
         <menu_item_call.on_click
           function="Facebook.Checkin" />
-- 
cgit v1.2.3


From 54e879cc22ec342f57cec23d38ba269b83489111 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Sat, 8 Jun 2013 00:48:46 +0100
Subject: added Facebook status update feature for ACME-502, ACME-503, and
 ACME-504

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e67350722d..2b2ac8c079 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -28,7 +28,13 @@
         name="CheckinToFacebook">
         <menu_item_call.on_click
           function="Facebook.Checkin" />
-      </menu_item_call>      
+      </menu_item_call>
+      <menu_item_call
+        label="Update status on Facebook..."
+        name="UpdateStatusOnFacebook">
+        <menu_item_call.on_click
+          function="Facebook.UpdateStatus" />
+      </menu_item_call>
       <menu_item_separator/>
       <menu_item_call
        label="Appearance..."
-- 
cgit v1.2.3


From 1643c4dacadf6df1cf7d000987a2c570eb4325ac Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 17 Jun 2013 18:30:36 -0700
Subject: CHUI 560: When Me->Post to Facebook... is selected the Facebook
 floater opens.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ebf21ffd1c..dea47f350f 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -35,6 +35,13 @@
         <menu_item_call.on_click
           function="Facebook.UpdateStatus" />
       </menu_item_call>
+      <menu_item_call
+        label="Post to Facebook..."
+        name="PostToFacebook">
+        <menu_item_call.on_click
+          function="Floater.Toggle"
+          parameter="social"/>
+      </menu_item_call>      
       <menu_item_separator/>
       <menu_item_call
        label="Appearance..."
-- 
cgit v1.2.3


From 7d17bbe132cf0f799b703bba978d48d44a1377c4 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 28 Jun 2013 19:26:07 +0100
Subject: removed unused Me menu items for ACME-637

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 733eb16c54..6da4b3d234 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -15,26 +15,6 @@
          function="ShowAgentProfile"
          parameter="agent" />
       </menu_item_call>
-      <menu_item_call
-        label="Connect to Facebook..."
-        name="ConnectToFacebook">
-        <menu_item_call.on_click
-          function="Facebook.Connect" />
-        <menu_item_call.on_enable
-          function="Facebook.EnableConnect" />
-      </menu_item_call>
-      <menu_item_call
-        label="Check in to Facebook..."
-        name="CheckinToFacebook">
-        <menu_item_call.on_click
-          function="Facebook.Checkin" />
-      </menu_item_call>
-      <menu_item_call
-        label="Update status on Facebook..."
-        name="UpdateStatusOnFacebook">
-        <menu_item_call.on_click
-          function="Facebook.UpdateStatus" />
-      </menu_item_call>
       <menu_item_call
         label="Post to Facebook..."
         name="PostToFacebook">
-- 
cgit v1.2.3


From ee0b66f080de53f70599c824d5ff231d6a9c739f Mon Sep 17 00:00:00 2001
From: "Jeff (Gioffredo Linden)" <gioffredo@lindenlab.com>
Date: Thu, 25 Jul 2013 16:07:16 -0400
Subject: VITA test framework - record events support

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b01c3067ff..b71faa2d3e 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2919,6 +2919,34 @@
          label="Recorder"
          name="Recorder"
          tear_off="true">
+            <menu_item_call visible="false"
+             label="Start event recording"
+             name="Start event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Stop event recording"
+             name="Stop event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="stop recording" />
+            </menu_item_call>
+            <menu_item_call visible="false"
+             label="Playback event recording"
+             name="Playback event recording">
+	      <menu_item_call.on_visible
+		 function="displayViewerEventRecorderMenuItems" />
+                <menu_item_call.on_click
+                 function="Advanced.EventRecorder"
+                 parameter="start playback" />
+            </menu_item_call>
+
             <menu_item_call
              label="Start Playback"
              name="Start Playback">
-- 
cgit v1.2.3


From 99fb8b6725996382d05b8f90ebfd4ec8707b308c Mon Sep 17 00:00:00 2001
From: dmitry <none@none>
Date: Thu, 22 Aug 2013 12:05:44 +0300
Subject: MAINT-2852 FIXED Update Help Menu and behavior: F1 Help menu no
 longer delivers results when searching dance, appearance or scripts

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 38 +++++++++-------------
 1 file changed, 15 insertions(+), 23 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index db45e515ad..647e2f1b2b 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1288,19 +1288,19 @@
      tear_off="true">
         <menu_item_call
          label="How to..."
-         name="How To">
+         name="How To"
+         shortcut="F1">
             <menu_item_call.on_click
              function="Help.ToggleHowTo"
              parameter="" />
         </menu_item_call>
         <menu_item_call
-         label="[SECOND_LIFE] Help"
-         name="Second Life Help"
-         shortcut="F1">
-            <menu_item_call.on_click
-             function="ShowHelp"
-             parameter="f1_help" />
-        </menu_item_call>
+           label="Quickstart"
+           name="Quickstart">
+        <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
+        </menu_item_call>              
 <!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
@@ -1309,21 +1309,13 @@
              parameter="hud" />
         </menu_item_call>-->
 		<menu_item_separator/>
-		
-		<menu_item_call
-             label="User’s guide"
-             name="User’s guide">
-             <menu_item_call.on_click
-                 function="Advanced.ShowURL"
-                 parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
-        </menu_item_call>
-        <menu_item_call
-             label="Knowledge Base"
-             name="Knowledge Base">
-             <menu_item_call.on_click
-                 function="Advanced.ShowURL"
-                 parameter="http://community.secondlife.com/t5/tkb/communitypage"/>
-        </menu_item_call>
+      <menu_item_call
+           label="Knowledge Base"
+           name="Knowledge Base">
+        <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+      </menu_item_call>
         <menu_item_call
              label="Wiki"
              name="Wiki">
-- 
cgit v1.2.3


From f4d2e21f4fdf6953cfa375bd716b1458e3de14e8 Mon Sep 17 00:00:00 2001
From: ZaiLynch <none@none>
Date: Wed, 11 Sep 2013 12:17:22 -0400
Subject: Changing shortcut to toggle preference floater

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/menu_viewer.xml')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index dabfc4eebd..0e95a9d9a9 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -180,7 +180,7 @@
          name="Preferences"
          shortcut="control|P">
             <menu_item_call.on_click
-             function="Floater.Show"
+             function="Floater.Toggle"
              parameter="preferences" />
         </menu_item_call>
          <menu_item_call
-- 
cgit v1.2.3