summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_login.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-30 14:24:36 -0700
committerRichard Linden <none@none>2011-03-30 14:24:36 -0700
commit5f4a85be9111793f25261b0551460e09e1656f18 (patch)
tree3a85977c765291c93710ecc59abd5ae717d72b91 /indra/newview/skins/default/xui/en/panel_login.xml
parent2f190297f0ff37452b3e966c0878e14a6aacc41b (diff)
parent84b179b0bf254ae039dfdba330d25ac2df1c0a67 (diff)
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_login.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml1
1 files changed, 0 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 4c2faddfe4..8d0f1437e6 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -133,7 +133,6 @@ label="Remember password"
max_chars="128"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
top_pad="0"
- control_name="SessionSettingsFile"
name="mode_combo"
width="110">
<combo_box.item