summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-06-28 13:49:03 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-06-28 13:49:03 -0700
commitefbe197028473a39ea3aab16829462d585d44fb2 (patch)
tree7ae457b9d02f935732100b3bf53e96706c1085f0 /indra/newview/skins/default
parentdb5aba55b1d51f083dd61781c32c57c0b986909a (diff)
parent89ae19e57edc9abfd300b17caf2719d7794dabf9 (diff)
merge
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_viewer.xml20
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml32
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_snapshot_facebook.xml4
3 files changed, 2 insertions, 54 deletions
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
@@ -16,26 +16,6 @@
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">
<menu_item_call.on_click
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5f4869e110..1f20d3ab58 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5442,17 +5442,6 @@ Sorry, the settings couldn't be applied to the region. Leaving the region and t
<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"
name="EnvCannotDeleteLastDayCycleKey"
type="alertmodal">
Unable to delete the last key in this day cycle because you cannot have an empty day cycle. You should modify the last remaining key instead of attempting to delete it and then to create a new one.
@@ -10135,25 +10124,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>