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 --------------------
 .../newview/skins/default/xui/en/notifications.xml  | 21 ---------------------
 .../default/xui/en/panel_snapshot_facebook.xml      |  4 ++--
 3 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'indra/newview/skins')

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">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5f4869e110..c8911e47e8 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -10135,25 +10135,4 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
   
-  <notification
-   icon="alertmodal.tga"
-   name="FacebookUpdateStatus"
-   type="alertmodal">
-    What's on your mind? (asks Facebook)
-    <tag>confirm</tag>
-    <form name="form">
-      <input name="message" type="text">
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-  
 </notifications>
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml b/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml
index 2810f97ca6..7a89ed69b5 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_facebook.xml
@@ -182,7 +182,7 @@
      top="350"
      width="100">
       <button.commit_callback
-       function="PostToFacebook.Cancel" />
+       function="SocialSharing.Cancel" />
     </button>
     <button
      follows="right|bottom"
@@ -194,6 +194,6 @@
      top_delta="0"
      width="100">
       <button.commit_callback
-       function="PostToFacebook.Send" />
+       function="SocialSharing.SendPhoto" />
     </button>
 </panel>
-- 
cgit v1.2.3


From 89ae19e57edc9abfd300b17caf2719d7794dabf9 Mon Sep 17 00:00:00 2001
From: Cho <cho@lindenlab.com>
Date: Fri, 28 Jun 2013 20:19:17 +0100
Subject: removed old error popups and added better logging for ACME-653

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c8911e47e8..1f20d3ab58 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5439,17 +5439,6 @@ This day cycle file references a missing sky file: [SKY].
 Sorry, the settings couldn't be applied to the region.  Leaving the region and then returning may help rectify the problem.  The reason given was: [FAIL_REASON]
   </notification>
 
-  <notification
-   functor="GenericAcknowledge"
-   icon="alertmodal.tga"
-   name="FacebookCannotConnect"
-   type="alertmodal">
-Connection to Facebook failed. Reason: [STATUS] [REASON] ([CODE] - [DESCRIPTION])
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-    
   <notification
    functor="GenericAcknowledge"
    icon="alertmodal.tga"
-- 
cgit v1.2.3