diff options
| -rwxr-xr-x | indra/newview/llpanellogin.cpp | 3 | ||||
| -rwxr-xr-x | indra/newview/skins/default/textures/textures.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/PushButton_Login_On.png | bin | 0 -> 542 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png | bin | 0 -> 563 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/first_login_image_left.png | bin | 251572 -> 311306 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/first_login_image_right.png | bin | 274356 -> 329170 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/textures/windows/login_sl_logo.png | bin | 33742 -> 21797 bytes | |||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_login.xml | 561 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login_first.xml | 22 |
9 files changed, 309 insertions, 281 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 330da6a15f..a17f6a2a7d 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -634,8 +634,7 @@ void LLPanelLogin::updateLocationSelectorsVisibility() sInstance->getChild<LLLayoutPanel>("start_location_panel")->setVisible(show_start); BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); - //sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server); - sInstance->getChild<LLComboBox>("server_combo")->setVisible(show_server); + sInstance->getChild<LLLayoutPanel>("grid_panel")->setVisible(show_server); } } diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 011e2b47ab..4e643493de 100755 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -486,6 +486,10 @@ with the same filename but different name <texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> <texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Login_On" file_name="widgets/PushButton_Login_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + <texture name="PushButton_Login_On_Selected" file_name="widgets/PushButton_Login_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" /> + + <texture name="RadioButton_Press" file_name="widgets/RadioButton_Press.png" preload="true" /> <texture name="RadioButton_On_Press" file_name="widgets/RadioButton_On_Press.png" preload="true" /> <texture name="RadioButton_Off" file_name="widgets/RadioButton_Off.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png Binary files differnew file mode 100644 index 0000000000..3ccf888632 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_On.png diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png Binary files differnew file mode 100644 index 0000000000..257fed1764 --- /dev/null +++ b/indra/newview/skins/default/textures/widgets/PushButton_Login_On_Selected.png diff --git a/indra/newview/skins/default/textures/windows/first_login_image_left.png b/indra/newview/skins/default/textures/windows/first_login_image_left.png Binary files differindex bb485be091..b405a88245 100644 --- a/indra/newview/skins/default/textures/windows/first_login_image_left.png +++ b/indra/newview/skins/default/textures/windows/first_login_image_left.png diff --git a/indra/newview/skins/default/textures/windows/first_login_image_right.png b/indra/newview/skins/default/textures/windows/first_login_image_right.png Binary files differindex 87bd760671..22a6dd8a53 100644 --- a/indra/newview/skins/default/textures/windows/first_login_image_right.png +++ b/indra/newview/skins/default/textures/windows/first_login_image_right.png diff --git a/indra/newview/skins/default/textures/windows/login_sl_logo.png b/indra/newview/skins/default/textures/windows/login_sl_logo.png Binary files differindex 132912239a..9810d00237 100644 --- a/indra/newview/skins/default/textures/windows/login_sl_logo.png +++ b/indra/newview/skins/default/textures/windows/login_sl_logo.png diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 760069f897..be6d109b6f 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -1,341 +1,366 @@ <panel
- follows="all"
- height="768"
- layout="topleft"
- name="panel_login"
- focus_root="true"
- background_visible="true"
- bg_opaque_color="0.16 0.16 0.16 1"
- background_opaque="true"
- width="1024">
+ follows="all"
+ height="768"
+ layout="topleft"
+ name="panel_login"
+ focus_root="true"
+ background_visible="true"
+ bg_opaque_color="0.16 0.16 0.16 1"
+ background_opaque="true"
+ width="1024">
<panel.string
- name="forgot_password_url">
+ name="forgot_password_url">
http://secondlife.com/account/request.php
</panel.string>
<layout_stack
- follows="left|right|top|bottom"
- width="1024"
- height="768"
- left="0"
- name="logo_stack"
- orientation="vertical"
- top="0">
+ follows="left|right|top|bottom"
+ width="1024"
+ height="768"
+ left="0"
+ name="logo_stack"
+ orientation="vertical"
+ top="0">
<layout_panel
- height="30"
- auto_resize="false"
- name="page_top"
- width="1024" />
+ height="30"
+ auto_resize="false"
+ name="page_top"
+ width="1024" />
<!-- start of logo stack -->
<layout_panel
- height="140"
- min_height="10"
- auto_resize="false"
- name="parent_panel"
- width="1024">
- <layout_stack
- follows="left|right|top|bottom"
- height="400"
- left="0"
- name="logo_stack"
- orientation="horizontal"
- top="0"
+ height="110"
+ min_height="10"
+ auto_resize="false"
+ name="parent_panel"
width="1024">
- <layout_panel
- height="400"
- min_height="0"
- auto_resize="true"
- name="logo_left"
- width="300" />
- <layout_panel
- auto_resize="false"
- follows="left|right|top"
- name="logo_container"
- width="315"
+ <layout_stack
+ follows="left|right|top|bottom"
+ height="100"
left="0"
+ name="logo_stack"
+ orientation="horizontal"
top="0"
- height="215">
- <icon
- height="128"
- image_name="login_sl_logo"
+ width="1024">
+ <layout_panel
+ height="100"
+ min_height="0"
+ auto_resize="true"
+ name="logo_left"
+ width="300" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|right|top"
+ name="logo_container"
+ width="225"
left="0"
- name="sl_logo"
- top="0" />
+ top="0"
+ height="94">
+ <icon
+ height="94"
+ image_name="login_sl_logo"
+ left="0"
+ name="sl_logo"
+ top="0" />
</layout_panel>
<layout_panel
- height="400"
- name="logo_right"
- auto_resize="true"
- width="300" />
+ height="100"
+ name="logo_right"
+ auto_resize="true"
+ width="300" />
</layout_stack>
</layout_panel>
<!-- end of logo stack -->
<!-- start of widget1 stack -->
<layout_panel
- height="80"
- min_height="10"
- auto_resize="false"
- name="parent_panel2"
- width="1024">
- <layout_stack
- follows="left|right|top|bottom"
height="80"
- left="0"
- name="widget_stack"
- orientation="horizontal"
- top="0"
+ min_height="10"
+ auto_resize="false"
+ name="parent_panel2"
width="1024">
- <layout_panel
- height="100"
- min_height="10"
- auto_resize="true"
- name="widget_left"
- width="100" />
- <layout_panel
- auto_resize="false"
- follows="left|right|top"
- name="widget_container"
- width="560"
+ <layout_stack
+ follows="left|right|top|bottom"
+ height="80"
left="0"
+ name="widget_stack"
+ orientation="horizontal"
top="0"
- height="80">
- <!-- width 560 -->
- <combo_box
- allow_text_entry="true"
- follows="left|bottom"
- height="32"
- left="0"
- label="Username"
- combo_editor.font="SansSerifLarge"
- max_chars="128"
+ width="1024">
+ <layout_panel
+ height="100"
+ min_height="10"
+ auto_resize="true"
+ name="widget_left"
+ width="100" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|top"
+ name="username_panel"
+ width="204"
top="0"
- commit_on_focus_lost="false"
- combo_editor.prevalidate_callback="ascii"
- tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
- name="username_combo"
- width="232">
- <!-- width 232 -->
+ height="80">
+ <combo_box
+ allow_text_entry="true"
+ follows="left|bottom"
+ height="32"
+ left="0"
+ label="Username"
+ combo_editor.font="SansSerifLarge"
+ max_chars="128"
+ top="0"
+ commit_on_focus_lost="false"
+ combo_editor.prevalidate_callback="ascii"
+ tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+ name="username_combo"
+ width="232">
<combo_box.combo_button
- visible="false" />
+ visible="false" />
<combo_box.drop_down_button
- visible="false" />
+ visible="false" />
</combo_box>
- <line_editor
+ <check_box
+ control_name="RememberPassword"
+ follows="left|top"
+ font="SansSerifLarge"
+ left="0"
+ top="32"
+ height="24"
+ label="Remember me"
+ check_button.bottom="3"
+ name="remember_check"
+ width="145" />
+ </layout_panel>
+ <layout_panel
+ auto_resize="false"
follows="left|top"
- height="32"
- left="220"
- max_length_bytes="16"
- name="password_edit"
- label="Password"
- font="SansSerifLarge"
- is_password="true"
- select_on_focus="true"
- commit_on_focus_lost="false"
+ name="panel_spacer_1"
+ width="16"
top="0"
- width="200" />
- <!-- width 200 -->
- <combo_box
- allow_text_entry="false"
- font="SansSerifTiny"
- follows="left|top"
- height="20"
- max_chars="128"
- left="432"
- top="12"
- layout="topleft"
- top_pad="2"
- name="server_combo"
- width="128" />
- <!-- width 128 -->
- <check_box
- control_name="RememberPassword"
+ height="80" />
+ <layout_panel
+ auto_resize="false"
follows="left|top"
- font="SansSerifLarge"
- left="0"
- top="32"
- height="24"
- label="Remember me"
- check_button.bottom="3"
- name="remember_check"
- width="145" />
+ name="password_panel"
+ width="200"
+ top="0"
+ height="80">
+ <line_editor
+ follows="left|top"
+ height="32"
+ left="0"
+ max_length_bytes="16"
+ name="password_edit"
+ label="Password"
+ font="SansSerifLarge"
+ is_password="true"
+ select_on_focus="true"
+ commit_on_focus_lost="false"
+ top="0"
+ width="200" />
<text
- follows="left|top"
- font="SansSerifLarge"
- text_color="EmphasisColor"
- height="16"
- name="forgot_password_text"
- left="216"
- top="34"
- width="200">
+ follows="left|top"
+ font="SansSerifLarge"
+ text_color="EmphasisColor"
+ height="16"
+ name="forgot_password_text"
+ left="0"
+ top="34"
+ width="200">
Forgotten password
</text>
</layout_panel>
<layout_panel
- height="20"
- name="widget_right"
- auto_resize="true"
- width="100" />
+ auto_resize="false"
+ follows="left|top"
+ name="panel_spacer_1"
+ width="16"
+ top="0"
+ height="80" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|top"
+ name="grid_panel"
+ width="128"
+ top="0"
+ height="80">
+ <combo_box
+ allow_text_entry="false"
+ font="SansSerifTiny"
+ follows="left|top"
+ height="32"
+ max_chars="128"
+ left="0"
+ top="0"
+ layout="topleft"
+ top_pad="2"
+ name="server_combo"
+ width="128" />
+ </layout_panel>
+ <layout_panel
+ height="20"
+ name="widget_right"
+ auto_resize="true"
+ width="100" />
</layout_stack>
</layout_panel>
<!-- end of widget1 stack -->
<!-- start of widget2 stack -->
<layout_panel
- height="58"
- min_height="10"
- auto_resize="false"
- name="parent_panel3"
- width="1024">
- <layout_stack
- follows="left|right|top|bottom"
- height="50"
- left="0"
- name="widget_stack"
- orientation="horizontal"
- top="0"
+ height="58"
+ min_height="10"
+ auto_resize="false"
+ name="parent_panel3"
width="1024">
- <layout_panel
+ <layout_stack
+ follows="left|right|top|bottom"
height="50"
- min_height="10"
- auto_resize="true"
- name="widget_left"
- width="200" />
- <layout_panel
- auto_resize="false"
- follows="left|right|top"
- name="widget_container"
- width="832"
left="0"
+ name="widget_stack"
+ orientation="horizontal"
top="0"
- height="50">
- <button
- follows="left|top"
- image_unselected="PushButton_On"
- image_selected="PushButton_On_Selected"
- label="Log In"
- label_color="White"
- font="SansSerifMedium"
- name="connect_btn"
+ width="1024">
+ <layout_panel
+ height="50"
+ min_height="10"
+ auto_resize="true"
+ name="widget_left"
+ width="200" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|right|top"
+ name="widget_container"
+ width="832"
left="0"
- width="64"
- height="30"
- top="0" />
+ top="0"
+ height="50">
+ <button
+ follows="left|top"
+ image_unselected="PushButton_Login_On"
+ image_selected="PushButton_Login_On_Selected"
+ label="Log In"
+ label_color="White"
+ font="SansSerifMedium"
+ name="connect_btn"
+ left="0"
+ width="64"
+ height="30"
+ top="0" />
<text
- follows="left|top"
- font="SansSerifMedium"
- height="24"
- name="At_My_Last_Location_Label"
- left="72"
- top="8"
- width="200">
+ follows="left|top"
+ font="SansSerifMedium"
+ height="24"
+ name="At_My_Last_Location_Label"
+ left="72"
+ top="8"
+ width="200">
At my last location
</text>
<combo_box
- control_name="NextLoginLocation"
- follows="left|bottom"
- label="My favorites"
- height="30"
- max_chars="128"
- combo_editor.font="SansSerifMedium"
- left="290"
- top="0"
- name="start_location_combo"
- width="175"
- combo_button.scale_image="true">
+ control_name="NextLoginLocation"
+ follows="left|bottom"
+ label="My favorites"
+ height="30"
+ max_chars="128"
+ combo_editor.font="SansSerifMedium"
+ left="290"
+ top="0"
+ name="start_location_combo"
+ width="175"
+ combo_button.scale_image="true">
<combo_box.item
- label="My home"
- name="MyHome"
- value="home" />
+ label="My home"
+ name="MyHome"
+ value="home" />
</combo_box>
<button
- follows="left|top"
- image_unselected="PushButton_On"
- image_selected="PushButton_On_Selected"
- label="Log In"
- label_color="White"
- font="SansSerifMedium"
- name="connect_favorite_btn"
- left="470"
- width="64"
- height="30"
- top="0" />
+ follows="left|top"
+ image_unselected="PushButton_Login_On"
+ image_selected="PushButton_Login_On_Selected"
+ label="Log In"
+ label_color="White"
+ font="SansSerifMedium"
+ name="connect_favorite_btn"
+ left="470"
+ width="64"
+ height="30"
+ top="0" />
<line_editor
- follows="left|top"
- width="170"
- height="30"
- left="590"
- name="location_edit"
- label="Type a location"
- font="SansSerifMedium"
- select_on_focus="true"
- commit_on_focus_lost="false"
- top="0" />
+ follows="left|top"
+ width="170"
+ height="30"
+ left="590"
+ name="location_edit"
+ label="Type a location"
+ font="SansSerifMedium"
+ select_on_focus="true"
+ commit_on_focus_lost="false"
+ top="0" />
<button
- follows="left|top"
- image_unselected="PushButton_On"
- image_selected="PushButton_On_Selected"
- label="Log In"
- label_color="White"
- font="SansSerifMedium"
- name="connect_location_btn"
- left="768"
- width="64"
- height="30"
- top="0" />
+ follows="left|top"
+ image_unselected="PushButton_Login_On"
+ image_selected="PushButton_Login_On_Selected"
+ label="Log In"
+ label_color="White"
+ font="SansSerifMedium"
+ name="connect_location_btn"
+ left="768"
+ width="64"
+ height="30"
+ top="0" />
</layout_panel>
<layout_panel
- height="100"
- name="widget_right"
- auto_resize="true"
- width="200" />
+ height="100"
+ name="widget_right"
+ auto_resize="true"
+ width="200" />
</layout_stack>
</layout_panel>
<!-- end of widget2 stack -->
<!-- start of browser stack -->
<layout_panel
- height="400"
- min_height="10"
- auto_resize="false"
- name="parent_pane4"
- width="1024">
- <layout_stack
- follows="left|right|top|bottom"
height="400"
- left="0"
- name="browser_stack"
- orientation="horizontal"
- top="0"
+ min_height="10"
+ auto_resize="false"
+ name="parent_pane4"
width="1024">
- <layout_panel
+ <layout_stack
+ follows="left|right|top|bottom"
height="400"
- min_height="0"
- auto_resize="true"
- name="browser_left"
- width="300" />
- <layout_panel
- auto_resize="false"
- follows="left|right|top"
- name="browser_container"
- width="850"
left="0"
+ name="browser_stack"
+ orientation="horizontal"
top="0"
- height="400">
- <web_browser
- tab_stop="false"
- trusted_content="true"
- bg_opaque_color="Black"
- border_visible="false"
- follows="all"
+ width="1024">
+ <layout_panel
+ height="400"
+ min_height="0"
+ auto_resize="true"
+ name="browser_left"
+ width="300" />
+ <layout_panel
+ auto_resize="false"
+ follows="left|right|top"
+ name="browser_container"
+ width="850"
left="0"
- name="login_html"
- start_url=""
top="0"
- height="400"
- width="850" />
+ height="400">
+ <web_browser
+ tab_stop="false"
+ trusted_content="true"
+ bg_opaque_color="Black"
+ border_visible="false"
+ follows="all"
+ left="0"
+ name="login_html"
+ start_url=""
+ top="0"
+ height="400"
+ width="850" />
</layout_panel>
<layout_panel
- height="400"
- name="browser_right"
- auto_resize="true"
- width="300" />
+ height="400"
+ name="browser_right"
+ auto_resize="true"
+ width="300" />
</layout_stack>
</layout_panel>
<!-- end of browser stack -->
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index 11751151b2..4b2b0a8a50 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -17,27 +17,27 @@ orientation="vertical" top="0"> <layout_panel - height="48" + height="18" auto_resize="false" name="page_top" width="1024" /> <!-- start of logo stack --> <layout_panel - height="150" + height="130" min_height="10" auto_resize="false" name="parent_panel" width="1024"> <layout_stack follows="left|right|top|bottom" - height="400" + height="100" left="0" name="logo_stack" orientation="horizontal" top="0" width="1024"> <layout_panel - height="400" + height="110" min_height="10" auto_resize="true" name="logo_left" @@ -46,19 +46,19 @@ auto_resize="false" follows="left|right|top" name="logo_container" - width="315" + width="225" left="0" top="0" - height="215"> + height="105"> <icon - height="128" + height="94" image_name="login_sl_logo" left="0" name="sl_logo" - top="15" /> + top="0" /> </layout_panel> <layout_panel - height="400" + height="100" name="logo_right" auto_resize="true" width="300" /> @@ -128,8 +128,8 @@ top="0" /> <button follows="left|top" - image_unselected="PushButton_On" - image_selected="PushButton_On_Selected" + image_unselected="PushButton_Login_On" + image_selected="PushButton_Login_On_Selected" label="Log In" label_color="White" font="SansSerifLarge" |
