From 2ce76c7ed47b49f8a7bafe69bdea064189e1ccbd Mon Sep 17 00:00:00 2001 From: James Cook <james@lindenlab.com> Date: Tue, 23 Jun 2009 23:32:39 +0000 Subject: Set correct svn:eol-style native on XML files, converted several files to use consistent line feeds (had ^M after first header line). Not reviewed. --- .../skins/default/xui/en/floater_nearby_chat.xml | 64 ++-- .../skins/default/xui/en/floater_test_combobox.xml | 286 ++++++++-------- .../skins/default/xui/en/panel_script_ed.xml | 380 ++++++++++----------- .../default/xui/en/panel_side_tray_tab_caption.xml | 4 +- .../default/xui/en/panel_teleport_history.xml | 4 +- .../skins/default/xui/en/panel_world_map.xml | 256 +++++++------- 6 files changed, 497 insertions(+), 497 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index f4fd6b01b4..afac4a4051 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,32 +1,32 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater - background_opaque="false" - background_visible="true" - bevel_style="in" - bg_alpha_color="0.3 0.3 0.3 1.0" - height="300" - layout="topleft" - name="nearby_chat" - save_rect="true" - title="Nearby Chat" - width="320"> - <panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption"> - <text - width="140" left="25" height="20" follows="left|right|top" - font="SansSerifBigBold" text_color="white" word_wrap="true" - mouse_opaque="true" name="sender_name" >NEARBY CHAT </text> - <icon top="5" left="250" - width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga" - mouse_opaque="true" name="nearby_speakers_btn"/> - <icon top="5" left="275" - width="20" height="20" follows="top|right" - color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga" - mouse_opaque="true" name="tearoff_btn"/> - <icon top="5" left="300" - width="15" height="15" follows="top|right" - color="1 1 1 1" enabled="true" image_name="closebox.tga" - name="close_btn"/> - </panel> - <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" /> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<floater + background_opaque="false" + background_visible="true" + bevel_style="in" + bg_alpha_color="0.3 0.3 0.3 1.0" + height="300" + layout="topleft" + name="nearby_chat" + save_rect="true" + title="Nearby Chat" + width="320"> + <panel top="20" width="320" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="chat_caption"> + <text + width="140" left="25" height="20" follows="left|right|top" + font="SansSerifBigBold" text_color="white" word_wrap="true" + mouse_opaque="true" name="sender_name" >NEARBY CHAT </text> + <icon top="5" left="250" + width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="icn_voice-groupfocus.tga" + mouse_opaque="true" name="nearby_speakers_btn"/> + <icon top="5" left="275" + width="20" height="20" follows="top|right" + color="1 1 1 1" enabled="true" image_name="inv_item_landmark_visited.tga" + mouse_opaque="true" name="tearoff_btn"/> + <icon top="5" left="300" + width="15" height="15" follows="top|right" + color="1 1 1 1" enabled="true" image_name="closebox.tga" + name="close_btn"/> + </panel> + <chat_history_view bottom="0" width="250" height="320" follows="left|right|top|bottom" name="chat_scroll" /> +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_test_combobox.xml b/indra/newview/skins/default/xui/en/floater_test_combobox.xml index 9e1253ec56..4bc1b8b644 100644 --- a/indra/newview/skins/default/xui/en/floater_test_combobox.xml +++ b/indra/newview/skins/default/xui/en/floater_test_combobox.xml @@ -1,143 +1,143 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - can_resize="true" - height="400" - layout="topleft" - name="floater_test_combobox" - width="400"> - <text - type="string" - length="1" - height="16" - layout="topleft" - left="10" - top="24" - width="200"> - Real world usage (login location): - </text> - <combo_box - allow_text_entry="true" - control_name="LoginLocation" - follows="left|bottom" - height="18" - layout="topleft" - left_delta="0" - max_chars="128" - name="start_location_combo" - top_pad="2" - width="155"> - <combo_box.item - label="My Last Location" - value="last" /> - <combo_box.item - label="My Home" - value="home" /> - <combo_box.item - label="<Type region name>" - value="" /> - </combo_box> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - top_pad="24" - width="200"> - Minimal combobox: - </text> - <combo_box - height="18" - layout="topleft" - left_delta="0" - name="minimal_combo" - top_pad="2" - width="150"> - <combo_box.item - label="First Item" - value="first" /> - <combo_box.item - label="Second Item" - value="second" /> - </combo_box> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - top_pad="24" - width="200"> - Allow text input: - </text> - <combo_box - allow_text_entry="true" - height="18" - layout="topleft" - left_delta="0" - name="text_entry_combo" - top_pad="2" - width="150"> - <combo_box.item - label="First Item" - value="first" /> - <combo_box.item - label="Second Item" - value="second" /> - </combo_box> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - top_pad="24" - width="200"> - Allow text input, default to second item: - </text> - <combo_box - allow_text_entry="true" - height="18" - initial_value="second" - layout="topleft" - left_delta="0" - name="text_entry_combo" - top_pad="2" - width="150"> - <combo_box.item - label="First Item" - value="first" /> - <combo_box.item - label="Second Item" - value="second" /> - </combo_box> - <text - type="string" - length="1" - height="16" - layout="topleft" - left_delta="0" - top_pad="24" - width="200"> - Two character max input: - </text> - <combo_box - allow_text_entry="true" - height="16" - layout="topleft" - left_delta="0" - max_chars="2" - name="state_combo" - top_pad="4" - width="150"> - <combo_box.item - label="CA" - value="ca" /> - <combo_box.item - label="NY" - value="ny" /> - <combo_box.item - label="TX" - value="tx" /> - </combo_box> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + can_resize="true" + height="400" + layout="topleft" + name="floater_test_combobox" + width="400"> + <text + type="string" + length="1" + height="16" + layout="topleft" + left="10" + top="24" + width="200"> + Real world usage (login location): + </text> + <combo_box + allow_text_entry="true" + control_name="LoginLocation" + follows="left|bottom" + height="18" + layout="topleft" + left_delta="0" + max_chars="128" + name="start_location_combo" + top_pad="2" + width="155"> + <combo_box.item + label="My Last Location" + value="last" /> + <combo_box.item + label="My Home" + value="home" /> + <combo_box.item + label="<Type region name>" + value="" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Minimal combobox: + </text> + <combo_box + height="18" + layout="topleft" + left_delta="0" + name="minimal_combo" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + value="first" /> + <combo_box.item + label="Second Item" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Allow text input: + </text> + <combo_box + allow_text_entry="true" + height="18" + layout="topleft" + left_delta="0" + name="text_entry_combo" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + value="first" /> + <combo_box.item + label="Second Item" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Allow text input, default to second item: + </text> + <combo_box + allow_text_entry="true" + height="18" + initial_value="second" + layout="topleft" + left_delta="0" + name="text_entry_combo" + top_pad="2" + width="150"> + <combo_box.item + label="First Item" + value="first" /> + <combo_box.item + label="Second Item" + value="second" /> + </combo_box> + <text + type="string" + length="1" + height="16" + layout="topleft" + left_delta="0" + top_pad="24" + width="200"> + Two character max input: + </text> + <combo_box + allow_text_entry="true" + height="16" + layout="topleft" + left_delta="0" + max_chars="2" + name="state_combo" + top_pad="4" + width="150"> + <combo_box.item + label="CA" + value="ca" /> + <combo_box.item + label="NY" + value="ny" /> + <combo_box.item + label="TX" + value="tx" /> + </combo_box> +</floater> diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index 5a452bd706..f059f4f3c1 100644 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -1,190 +1,190 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - bevel_style="none" - border_style="line" - bottom="550" - follows="left|top|right|bottom" - height="508" - layout="topleft" - left="0" - name="script panel" - width="500"> - <panel.string - name="loading"> - Loading... - </panel.string> - <panel.string - name="can_not_view"> - You are not allowed to view this script. - </panel.string> - <panel.string - name="public_objects_can_not_run"> - Public Objects cannot run scripts - </panel.string> - <panel.string - name="script_running"> - Running - </panel.string> - <panel.string - name="Title"> - Script: [NAME] - </panel.string> - <text_editor - type="string" - length="1" - bevel_style="none" - border_style="line" - bottom="393" - follows="left|top|right|bottom" - font="Monospace" - height="376" - ignore_tab="false" - layout="topleft" - left="4" - max_length="65536" - name="Script Editor" - width="492" - word_wrap="true"> - Loading... - </text_editor> - <button - bottom="499" - follows="right|bottom" - height="20" - label="Save" - label_selected="Save" - layout="topleft" - left="360" - name="Save_btn" - width="128" /> - <scroll_list - bottom="457" - follows="left|right|bottom" - height="60" - layout="topleft" - left="4" - name="lsl errors" - width="492" /> - <combo_box - bottom="499" - follows="left|bottom" - height="20" - label="Insert..." - layout="topleft" - left="12" - name="Insert..." - width="128" /> - <text - bottom="473" - follows="left|bottom" - height="12" - layout="topleft" - left="12" - name="line_col" - width="128" /> - <menu_bar - bg_visible="false" - bottom="18" - follows="left|top|right" - height="18" - layout="topleft" - left="8" - mouse_opaque="false" - name="script_menu" - width="476"> - <menu - bottom="18" - height="62" - label="File" - layout="topleft" - left="0" - mouse_opaque="false" - name="File" - width="138"> - <menu_item_call - label="Save" - layout="topleft" - name="Save" /> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="Revert All Changes" - layout="topleft" - name="Revert All Changes" /> - </menu> - <menu - bottom="-647" - height="198" - label="Edit" - layout="topleft" - left="222" - mouse_opaque="false" - name="Edit" - width="139"> - <menu_item_call - enabled="false" - label="Undo" - layout="topleft" - name="Undo" /> - <menu_item_call - enabled="false" - label="Redo" - layout="topleft" - name="Redo" /> - <menu_item_separator - layout="topleft" /> - <menu_item_call - enabled="false" - label="Cut" - layout="topleft" - name="Cut" /> - <menu_item_call - enabled="false" - label="Copy" - layout="topleft" - name="Copy" /> - <menu_item_call - enabled="false" - label="Paste" - layout="topleft" - name="Paste" /> - <menu_item_separator - layout="topleft" - name="separator2" /> - <menu_item_call - label="Select All" - layout="topleft" - name="Select All" /> - <menu_item_call - enabled="false" - label="Deselect" - layout="topleft" - name="Deselect" /> - <menu_item_separator - layout="topleft" - name="separator3" /> - <menu_item_call - label="Search / Replace..." - layout="topleft" - name="Search / Replace..." /> - </menu> - <menu - bottom="18" - height="34" - label="Help" - layout="topleft" - left="0" - mouse_opaque="false" - name="Help" - width="112"> - <menu_item_call - label="Help..." - layout="topleft" - name="Help..." /> - <menu_item_call - label="LSL Wiki Help..." - layout="topleft" - name="LSL Wiki Help..." /> - </menu> - </menu_bar> -</panel> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + bevel_style="none" + border_style="line" + bottom="550" + follows="left|top|right|bottom" + height="508" + layout="topleft" + left="0" + name="script panel" + width="500"> + <panel.string + name="loading"> + Loading... + </panel.string> + <panel.string + name="can_not_view"> + You are not allowed to view this script. + </panel.string> + <panel.string + name="public_objects_can_not_run"> + Public Objects cannot run scripts + </panel.string> + <panel.string + name="script_running"> + Running + </panel.string> + <panel.string + name="Title"> + Script: [NAME] + </panel.string> + <text_editor + type="string" + length="1" + bevel_style="none" + border_style="line" + bottom="393" + follows="left|top|right|bottom" + font="Monospace" + height="376" + ignore_tab="false" + layout="topleft" + left="4" + max_length="65536" + name="Script Editor" + width="492" + word_wrap="true"> + Loading... + </text_editor> + <button + bottom="499" + follows="right|bottom" + height="20" + label="Save" + label_selected="Save" + layout="topleft" + left="360" + name="Save_btn" + width="128" /> + <scroll_list + bottom="457" + follows="left|right|bottom" + height="60" + layout="topleft" + left="4" + name="lsl errors" + width="492" /> + <combo_box + bottom="499" + follows="left|bottom" + height="20" + label="Insert..." + layout="topleft" + left="12" + name="Insert..." + width="128" /> + <text + bottom="473" + follows="left|bottom" + height="12" + layout="topleft" + left="12" + name="line_col" + width="128" /> + <menu_bar + bg_visible="false" + bottom="18" + follows="left|top|right" + height="18" + layout="topleft" + left="8" + mouse_opaque="false" + name="script_menu" + width="476"> + <menu + bottom="18" + height="62" + label="File" + layout="topleft" + left="0" + mouse_opaque="false" + name="File" + width="138"> + <menu_item_call + label="Save" + layout="topleft" + name="Save" /> + <menu_item_separator + layout="topleft" /> + <menu_item_call + label="Revert All Changes" + layout="topleft" + name="Revert All Changes" /> + </menu> + <menu + bottom="-647" + height="198" + label="Edit" + layout="topleft" + left="222" + mouse_opaque="false" + name="Edit" + width="139"> + <menu_item_call + enabled="false" + label="Undo" + layout="topleft" + name="Undo" /> + <menu_item_call + enabled="false" + label="Redo" + layout="topleft" + name="Redo" /> + <menu_item_separator + layout="topleft" /> + <menu_item_call + enabled="false" + label="Cut" + layout="topleft" + name="Cut" /> + <menu_item_call + enabled="false" + label="Copy" + layout="topleft" + name="Copy" /> + <menu_item_call + enabled="false" + label="Paste" + layout="topleft" + name="Paste" /> + <menu_item_separator + layout="topleft" + name="separator2" /> + <menu_item_call + label="Select All" + layout="topleft" + name="Select All" /> + <menu_item_call + enabled="false" + label="Deselect" + layout="topleft" + name="Deselect" /> + <menu_item_separator + layout="topleft" + name="separator3" /> + <menu_item_call + label="Search / Replace..." + layout="topleft" + name="Search / Replace..." /> + </menu> + <menu + bottom="18" + height="34" + label="Help" + layout="topleft" + left="0" + mouse_opaque="false" + name="Help" + width="112"> + <menu_item_call + label="Help..." + layout="topleft" + name="Help..." /> + <menu_item_call + label="LSL Wiki Help..." + layout="topleft" + name="LSL Wiki Help..." /> + </menu> + </menu_bar> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml index e447e541e0..4ae90380f8 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray_tab_caption.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="sidetray_tab_panel" bottom="0" height="25" left="0" background_visible="false" bg_visible="false" border="false" border_visible="false" @@ -12,4 +12,4 @@ name="sidetray_tab_title" width="100"> Side Panel </text> -</panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 8f6a2d7648..b7ce812dc8 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Teleport History" bottom="0" height="326" left="0" width="380" border="true" follows="left|top|right|bottom"> <scroll_list bottom="0" can_resize="true" column_padding="0" draw_heading="true" @@ -9,4 +9,4 @@ <column dynamicwidth="true" label="Region" name="region" /> <column name="index" width="0" /> </scroll_list> -</panel> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_world_map.xml b/indra/newview/skins/default/xui/en/panel_world_map.xml index 532f487780..ee355fa95c 100644 --- a/indra/newview/skins/default/xui/en/panel_world_map.xml +++ b/indra/newview/skins/default/xui/en/panel_world_map.xml @@ -1,128 +1,128 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel - follows="left|top|right|bottom" - height="300" - layout="topleft" - name="world_map" - width="400"> - <panel.string - name="Loading"> - Loading... - </panel.string> - <panel.string - name="InvalidLocation"> - Invalid Location - </panel.string> - <panel.string - name="world_map_north"> - N - </panel.string> - <panel.string - name="world_map_east"> - E - </panel.string> - <panel.string - name="world_map_west"> - W - </panel.string> - <panel.string - name="world_map_south"> - S - </panel.string> - <panel.string - name="world_map_southeast"> - SE - </panel.string> - <panel.string - name="world_map_northeast"> - NE - </panel.string> - <panel.string - name="world_map_southwest"> - SW - </panel.string> - <panel.string - name="world_map_northwest"> - NW - </panel.string> - <text - type="string" - length="1" - label="N" - layout="topleft" - name="floater_map_north" - text="N" - text_color="1 1 1 0.7"> - N - </text> - <text - type="string" - length="1" - label="E" - layout="topleft" - name="floater_map_east" - text="E" - text_color="1 1 1 0.7"> - E - </text> - <text - type="string" - length="1" - label="W" - layout="topleft" - name="floater_map_west" - text="W" - text_color="1 1 1 0.7"> - W - </text> - <text - type="string" - length="1" - label="S" - layout="topleft" - name="floater_map_south" - text="S" - text_color="1 1 1 0.7"> - S - </text> - <text - type="string" - length="1" - label="SE" - layout="topleft" - name="floater_map_southeast" - text="SE" - text_color="1 1 1 0.7"> - SE - </text> - <text - type="string" - length="1" - label="NE" - layout="topleft" - name="floater_map_northeast" - text="NE" - text_color="1 1 1 0.7"> - NE - </text> - <text - type="string" - length="1" - label="SW" - layout="topleft" - name="floater_map_southwest" - text="SW" - text_color="1 1 1 0.7"> - SW - </text> - <text - type="string" - length="1" - label="NW" - layout="topleft" - name="floater_map_northwest" - text="NW" - text_color="1 1 1 0.7"> - NW - </text> -</panel> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + follows="left|top|right|bottom" + height="300" + layout="topleft" + name="world_map" + width="400"> + <panel.string + name="Loading"> + Loading... + </panel.string> + <panel.string + name="InvalidLocation"> + Invalid Location + </panel.string> + <panel.string + name="world_map_north"> + N + </panel.string> + <panel.string + name="world_map_east"> + E + </panel.string> + <panel.string + name="world_map_west"> + W + </panel.string> + <panel.string + name="world_map_south"> + S + </panel.string> + <panel.string + name="world_map_southeast"> + SE + </panel.string> + <panel.string + name="world_map_northeast"> + NE + </panel.string> + <panel.string + name="world_map_southwest"> + SW + </panel.string> + <panel.string + name="world_map_northwest"> + NW + </panel.string> + <text + type="string" + length="1" + label="N" + layout="topleft" + name="floater_map_north" + text="N" + text_color="1 1 1 0.7"> + N + </text> + <text + type="string" + length="1" + label="E" + layout="topleft" + name="floater_map_east" + text="E" + text_color="1 1 1 0.7"> + E + </text> + <text + type="string" + length="1" + label="W" + layout="topleft" + name="floater_map_west" + text="W" + text_color="1 1 1 0.7"> + W + </text> + <text + type="string" + length="1" + label="S" + layout="topleft" + name="floater_map_south" + text="S" + text_color="1 1 1 0.7"> + S + </text> + <text + type="string" + length="1" + label="SE" + layout="topleft" + name="floater_map_southeast" + text="SE" + text_color="1 1 1 0.7"> + SE + </text> + <text + type="string" + length="1" + label="NE" + layout="topleft" + name="floater_map_northeast" + text="NE" + text_color="1 1 1 0.7"> + NE + </text> + <text + type="string" + length="1" + label="SW" + layout="topleft" + name="floater_map_southwest" + text="SW" + text_color="1 1 1 0.7"> + SW + </text> + <text + type="string" + length="1" + label="NW" + layout="topleft" + name="floater_map_northwest" + text="NW" + text_color="1 1 1 0.7"> + NW + </text> +</panel> -- cgit v1.2.3