Skip to content
Snippets Groups Projects
Commit 4814ee15 authored by Erica Olsen's avatar Erica Olsen
Browse files

EXT-1199 Small layout tweaks, EXT-927 'Block object by name' dialog is broken

parent 76dd1716
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel border_thickness="2" name="splitter_parent" <panel border_thickness="0" name="splitter_parent"
background_visible="true" background_visible="true"
label="splitter_parent" label="splitter_parent"
title="" title=""
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater <floater
can_minimize="false" can_minimize="false"
height="140" height="130"
layout="topleft" layout="topleft"
name="mute by name" name="block by name"
help_topic="mute_by_name" help_topic="mute_by_name"
title="Block object by name" title="Block object by name"
width="375"> width="375">
<text <text
type="string" type="string"
length="1" length="1"
bottom_delta="50"
follows="top|left" follows="top|left"
font="SansSerif" font="SansSerifLarge"
height="16" height="16"
layout="topleft" layout="topleft"
left="20" left="10"
left_delta="25" top="25"
name="message" name="message">
right="380"> Block an object:
Block by name only affects object chat and IM, not sounds.
You must type the object&apos;s name exactly.
</text> </text>
<line_editor <line_editor
type="string" type="string"
length="1" length="1"
follows="top|right" follows="top|right"
font="SansSerif" font="SansSerif"
height="18" height="20"
layout="topleft" layout="topleft"
left_delta="0" left_delta="0"
name="object_name" name="object_name"
top_pad="22" top_pad="5"
width="320"> width="350">
Object name Object name
</line_editor> </line_editor>
<text
type="string"
length="1"
follows="top|left"
font="SansSerifSmall"
height="16"
layout="topleft"
left="30"
name="note">
* Only blocks object text, not sounds
</text>
<button <button
follows="bottom|left" follows="bottom|left"
height="20" height="23"
label="Ok" label="Ok"
layout="topleft" layout="topleft"
left="108" left="155"
name="OK" name="OK"
top="100" top_pad="10"
width="75" /> width="100" />
<button <button
follows="bottom|right" follows="bottom|right"
height="20" height="23"
label="Cancel" label="Cancel"
layout="topleft" layout="topleft"
left_pad="7" left_pad="5"
name="Cancel" name="Cancel"
top_delta="0" width="100" />
width="75" />
</floater> </floater>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
<button <button
follows="left|top" follows="left|top"
height="25" height="25"
label="Display Floater" label="Show"
label_selected="Display Floater" label_selected="Show"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="display_floater" name="display_floater"
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
enabled="false" enabled="false"
follows="left|top" follows="left|top"
height="25" height="25"
label="Close Floater" label="Hide"
label_selected="Close Floater" label_selected="Hide"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="close_displayed_floater" name="close_displayed_floater"
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
<button <button
follows="left|top" follows="left|top"
height="25" height="25"
label="Edit Floater..." label="Edit..."
label_selected="Edit Floater..." label_selected="Edit..."
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="edit_floater" name="edit_floater"
...@@ -144,8 +144,7 @@ ...@@ -144,8 +144,7 @@
<button <button
follows="left|top" follows="left|top"
height="25" height="25"
label="Display Floater" label="Show"
label_selected="Display Floater"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="display_floater_2" name="display_floater_2"
...@@ -156,8 +155,7 @@ ...@@ -156,8 +155,7 @@
enabled="false" enabled="false"
follows="left|top" follows="left|top"
height="25" height="25"
label="Close Floater" label="Hide"
label_selected="Close Floater"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="close_displayed_floater_2" name="close_displayed_floater_2"
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel <panel
follows="left|top|right|bottom" follows="all"
height="600" height="600"
layout="topleft" layout="topleft"
left="0" left="0"
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<web_browser <web_browser
border_visible="false" border_visible="false"
bottom="600" bottom="600"
follows="top|left|bottom|right" follows="all"
layout="topleft" layout="topleft"
left="0" left="0"
name="login_html" name="login_html"
hide_loading="true" hide_loading="true"
right="-1" right="-1"
start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
top="1" /> top="1" />
...@@ -44,10 +44,7 @@ ...@@ -44,10 +44,7 @@
First Name: First Name:
</text> </text>
<line_editor <line_editor
border_style="line"
border_thickness="1"
follows="left|bottom" follows="left|bottom"
font="SansSerif"
handle_edit_keys_directly="true" handle_edit_keys_directly="true"
height="20" height="20"
layout="topleft" layout="topleft"
...@@ -55,8 +52,8 @@ ...@@ -55,8 +52,8 @@
max_length="31" max_length="31"
name="first_name_edit" name="first_name_edit"
select_on_focus="true" select_on_focus="true"
tool_tip="Enter first name here" tool_tip="Second Life First Name"
top_pad="4" top_pad="2"
width="120" /> width="120" />
<text <text
type="string" type="string"
...@@ -72,8 +69,6 @@ ...@@ -72,8 +69,6 @@
Last Name: Last Name:
</text> </text>
<line_editor <line_editor
border_style="line"
border_thickness="1"
follows="left|bottom" follows="left|bottom"
font="SansSerif" font="SansSerif"
handle_edit_keys_directly="true" handle_edit_keys_directly="true"
...@@ -83,7 +78,7 @@ ...@@ -83,7 +78,7 @@
max_length="31" max_length="31"
name="last_name_edit" name="last_name_edit"
select_on_focus="true" select_on_focus="true"
top_pad="4" top_pad="2"
width="120" /> width="120" />
<text <text
type="string" type="string"
...@@ -99,8 +94,6 @@ ...@@ -99,8 +94,6 @@
Password: Password:
</text> </text>
<line_editor <line_editor
border_style="line"
border_thickness="1"
follows="left|bottom" follows="left|bottom"
font="SansSerif" font="SansSerif"
handle_edit_keys_directly="true" handle_edit_keys_directly="true"
...@@ -110,27 +103,26 @@ ...@@ -110,27 +103,26 @@
max_length="16" max_length="16"
name="password_edit" name="password_edit"
select_on_focus="true" select_on_focus="true"
top_pad="4" top_pad="2"
width="120" /> width="120" />
<button <button
follows="left|bottom" follows="left|bottom"
height="24" height="23"
label="Log In" label="Log In"
label_selected="Log In" label_selected="Log In"
layout="topleft" layout="topleft"
left="435" left="425"
name="connect_btn" name="connect_btn"
top="548" top="546"
width="120" /> width="100" />
<combo_box <combo_box
allow_text_entry="true" allow_text_entry="true"
follows="left|bottom" follows="left|bottom"
height="18" height="23"
layout="topleft" layout="topleft"
left_pad="15" left_pad="5"
name="server_combo" name="server_combo"
top_delta="2" width="100" />
width="120" />
<text <text
type="string" type="string"
length="1" length="1"
...@@ -142,15 +134,15 @@ ...@@ -142,15 +134,15 @@
name="start_location_text" name="start_location_text"
top="576" top="576"
width="95"> width="95">
Start Location: Start location:
</text> </text>
<combo_box <combo_box
allow_text_entry="true" allow_text_entry="true"
control_name="LoginLocation" control_name="LoginLocation"
follows="left|bottom" follows="left|bottom"
height="18" height="23"
layout="topleft" layout="topleft"
left_pad="2" left_pad="0"
max_chars="128" max_chars="128"
name="start_location_combo" name="start_location_combo"
top_delta="-2" top_delta="-2"
...@@ -172,13 +164,12 @@ ...@@ -172,13 +164,12 @@
control_name="RememberPassword" control_name="RememberPassword"
follows="left|bottom" follows="left|bottom"
height="16" height="16"
label="Remember password" label="Remember me"
layout="topleft" layout="topleft"
left_pad="10" left_pad="10"
name="remember_check" name="remember_check"
top_delta="3" top_delta="3"
width="138" /> width="138" />
<text <text
type="string" type="string"
length="1" length="1"
...@@ -192,7 +183,7 @@ ...@@ -192,7 +183,7 @@
name="create_new_account_text" name="create_new_account_text"
top="539" top="539"
width="200"> width="200">
Sign up for account Create a new account
</text> </text>
<text <text
type="string" type="string"
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<accordion_tab <accordion_tab
header_collapse_img="accordion_collapsed.tga" header_collapse_img="Accordion_ArrowClosed_Off"
header_collapse_img_pressed="accordion_collapsed.tga" header_collapse_img_pressed="Accordion_ArrowClosed_Press"
header_expand_img="accordion_expanded.tga" header_expand_img="Accordion_ArrowOpened_Off"
header_expand_img_pressed="accordion_expanded.tga" /> header_expand_img_pressed="Accordion_ArrowOpened_Press" />
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
<filter_editor <filter_editor
clear_button_visible="true" clear_button_visible="true"
search_button_visible="true" search_button_visible="true"
text_pad_left="4" text_pad_left="5"
select_on_focus="true" select_on_focus="true"
background_image="TextField_Search_Off" background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled" background_image_disabled="TextField_Search_Disabled"
background_image_focused="TextField_Search_Active" > background_image_focused="TextField_Search_Active">
<search_button label="" <search_button label=""
top_pad="4" top_pad="4"
left_pad="4" left_pad="4"
width="13" width="13"
height="13" height="13"
image_unselected="Search" image_unselected="Search"
image_selected="Search" /> image_selected="Search" />
<clear_button label="" <clear_button label=""
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
highlighted_color="ScrollHighlightedColor" highlighted_color="ScrollHighlightedColor"
column_padding="5" column_padding="5"
draw_stripes="true" draw_stripes="true"
background_visible="true" background_visible="false"
heading_height="20" heading_height="23"
draw_border="true" draw_border="false"
draw_heading="false"/> draw_heading="false" />
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment