summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-11-17 21:02:57 -0500
committerOz Linden <oz@lindenlab.com>2010-11-17 21:02:57 -0500
commitd76e0dd87f64258ade944323eb5cb6063bca7444 (patch)
tree1b142456106ab197e5b5cb57106c8eec63b5376b /indra/newview/skins/default/xui/en
parent81edfefcaff44cc66918199c39fa1dc54adc1eb5 (diff)
parentdc6e5371eb808b60dc2387812f6fd22aa9f44ac0 (diff)
merge fix for STORM-582
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml4
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a0fd0a13cc..1247e4724e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5539,7 +5539,7 @@ Friendship offer declined.
name="OfferCallingCard"
persist="true"
type="notify">
-[FIRST] [LAST] is offering their calling card.
+[NAME] is offering their calling card.
This will add a bookmark in your inventory so you can quickly IM this Resident.
<form name="form">
<button
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 15d1222d00..d6e4c56113 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -79,6 +79,7 @@
</radio_group>
<check_box
+ control_name="AllowMultipleViewers"
follows="top|left"
height="15"
label="Allow Multiple Viewer"
@@ -88,6 +89,7 @@
top_pad="20"
width="237"/>
<check_box
+ control_name="ForceShowGrid"
follows="top|left"
height="15"
label="Show Grid Selection at login"
@@ -97,6 +99,7 @@
top_pad="5"
width="237"/>
<check_box
+ control_name="UseDebugMenus"
follows="top|left"
height="15"
label="Show Advanced Menu"
@@ -106,6 +109,7 @@
top_pad="5"
width="237"/>
<check_box
+ control_name="QAMode"
follows="top|left"
height="15"
label="Show Developer Menu"