summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-12-07 16:31:14 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-12-07 16:31:14 +0200
commita2434a3a415b7882ec41124b085a576a3e825508 (patch)
tree0d754d63bb5bc02995d29747c6f54f78d9fb1d69
parent01447fb0d14ac34cea56c8ebd57b8f60e1535b76 (diff)
parent1db39c97a5ba8213c0c001b60060ba165f7dd04d (diff)
Merge from default branch.
--HG-- branch : product-engine
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 0bc2b44ad5..efe26d3887 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -75,16 +75,6 @@
tool_tip="[SECOND_LIFE] Last Name"
top_delta="0"
width="135" />
- <combo_box
- allow_text_entry="true"
- font="SansSerifSmall"
- follows="left|bottom"
- height="23"
- layout="topleft"
- top="60"
- name="server_combo"
- width="135"
- visible="false" />
<text
follows="left|bottom"
font="SansSerifSmall"
@@ -161,6 +151,16 @@
name="Typeregionname"
value="" />
</combo_box>
+ <combo_box
+ allow_text_entry="true"
+ font="SansSerifSmall"
+ follows="right|bottom"
+ height="23"
+ layout="topleft"
+ top_pad="2"
+ name="server_combo"
+ width="135"
+ visible="false" />
<text
follows="right|bottom"
font="SansSerifSmall"