summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-05-06 10:28:42 -0400
committerOz Linden <oz@lindenlab.com>2016-05-06 10:28:42 -0400
commit950c41d184b340a7a3370c2cbda5d1eed9a17b0b (patch)
tree373912394af6834d7d56258becf46954244b8423 /indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
parent20198b750d02c769ab6845226f98ce6e5dd1f20b (diff)
parent7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff)
merge 4.0.4-release and MAINT-5974
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_alerts.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_alerts.xml22
1 files changed, 15 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
index 714dca7fac..93c97ded25 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_alerts.xml
@@ -21,12 +21,12 @@
Tell me:
</text>
<check_box
- control_name="NotifyMoneyChange"
+ control_name="NotifyMoneySpend"
height="16"
- label="When I spend or get L$"
+ label="When I spend L$"
layout="topleft"
left_delta="50"
- name="notify_money_change_checkbox"
+ name="notify_money_spend_checkbox"
top_pad="4"
width="300" />
<check_box
@@ -34,10 +34,18 @@
height="16"
label="When my friends log in or out"
layout="topleft"
- left_delta="0"
- name="friends_online_notify_checkbox"
- top_pad="4"
- width="300" />
+ left_delta="150"
+ name="friends_online_notify_checkbox"
+ width="300" />
+ <check_box
+ control_name="NotifyMoneyReceived"
+ height="16"
+ label="When I get L$"
+ layout="topleft"
+ left_delta="-150"
+ top_pad="4"
+ name="notify_money_received_checkbox"
+ width="300" />
<text
type="string"
length="1"