summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-14 13:37:35 -0700
committerRichard Linden <none@none>2011-03-14 13:37:35 -0700
commit0b653187e0fa7f36142ba92020762404005c765f (patch)
treee1738d299004bdd4798135808a220848a9aa4a87 /indra/newview/skins
parent9c2a19b833e071ca90e1e7840f6646200b07402a (diff)
parentefc1d76aeb4dfd55131e503e70d883b79c528446 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cec04b0b58..4c2faddfe4 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -137,7 +137,7 @@ label="Remember password"
name="mode_combo"
width="110">
<combo_box.item
- label="Basic (Default)"
+ label="Basic"
name="Basic"
value="settings_minimal.xml" />
<combo_box.item