summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-08 17:24:42 -0800
committerDon Kjer <don@lindenlab.com>2010-12-08 17:24:42 -0800
commit3ecfe0c68403d683a94df987567ae8c9ef2d2ed2 (patch)
tree6dec7c7bafbc85912a71faf08898ca6ecc6225dd /indra/newview/skins
parente3e6d429d4d3322c14292a4b77991d7d6114a3df (diff)
parentd9b4570883652d647c05083c18fac1a088efd6e2 (diff)
Merge from http://bitbucket.org/lindenlab/viewer-development
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 b181ca3bba..89feba7c3c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -127,7 +127,7 @@ top="20"
</text>
<combo_box
allow_text_entry="true"
-control_name="LoginLocation"
+control_name="NextLoginLocation"
follows="left|bottom"
height="23"
max_chars="128"