summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorCho <cho@lindenlab.com>2013-06-12 01:16:27 +0100
committerCho <cho@lindenlab.com>2013-06-12 01:16:27 +0100
commit933debfc10d09d1d25fd196597904fc9753b4cb0 (patch)
tree52701d571d736e67683df1f894421d6e5438429d /indra/newview/skins
parente3f093a87157c012ab4e9d378cc26876b7b91900 (diff)
cleaned up FBC snapshot feature and made it work with new direct upload route on FBC API
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/menu_gear_fbc.xml9
-rwxr-xr-xindra/newview/skins/default/xui/en/notifications.xml2
2 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
index 2c341b6ecc..cf27f528ee 100644
--- a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
+++ b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
@@ -40,12 +40,5 @@
name="Facebook App Add">
<menu_item_check.on_click
function="People.testaddFBCFolderView"/>
- </menu_item_check>
- <menu_item_check
- label="Facebook post checkin message"
- layout="topleft"
- name="Facebook Checkin">
- <menu_item_check.on_click
- function="People.testFBCCheckin"/>
</menu_item_check>
-</toggleable_menu> \ No newline at end of file
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index d69f1bb4d5..d1d8291c90 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5444,7 +5444,7 @@ Sorry, the settings couldn't be applied to the region. Leaving the region and t
icon="alertmodal.tga"
name="FacebookCannotConnect"
type="alertmodal">
-Connection to Facebook failed. Reason: [FAIL_REASON].
+Connection to Facebook failed. Reason: [STATUS] [REASON] ([CODE] - [DESCRIPTION])
<usetemplate
name="okbutton"
yestext="OK"/>