aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/skins')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml44
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml63
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml7
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/fonts.xml4
-rwxr-xr-xlinden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml11
-rwxr-xr-xlinden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml11
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml15
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml27
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml6
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml4
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_login.xml20
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml20
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml27
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml4
20 files changed, 210 insertions, 82 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 5836901..d57ca5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -915,32 +915,18 @@ Only large parcels can be listed in search.
915 right="-12" 915 right="-12"
916 scale_image="true" 916 scale_image="true"
917 width="70" /> 917 width="70" />
918 <check_box
919 bottom_delta="-22"
920 enabled="true"
921 follows="left|top"
922 font="SansSerifSmall"
923 height="16"
924 initial_value="false"
925 label="Hide URL"
926 left="80"
927 mouse_opaque="true"
928 name="hide_media_url"
929 radio_style="false"
930 tool_tip="Checking this option will hide the media URL from any non-authorized viewers of this parcel information. Note this is not available for HTML types."
931 width="150" />
932 <text 918 <text
933 bottom_delta="0" 919 bottom_delta="-22"
934 follows="right|top" 920 follows="right|top"
935 font="SansSerifSmall" 921 font="SansSerifSmall"
936 halign="right" 922 halign="left"
937 height="16" 923 height="16"
938 length="1" 924 length="1"
939 name="media_reset" 925 name="media_reset"
940 right="-164" 926 left="80"
941 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)" 927 tool_tip="Amount of time until parcel automatically reverts to default URL (0 for never return)"
942 type="string" 928 type="string"
943 width="185"> 929 width="120">
944 Return to Home URL in: 930 Return to Home URL in:
945 </text> 931 </text>
946 <spinner 932 <spinner
@@ -948,14 +934,13 @@ Only large parcels can be listed in search.
948 decimal_digits="0" 934 decimal_digits="0"
949 enabled="false" 935 enabled="false"
950 follows="right|top" 936 follows="right|top"
951 halign="right"
952 height="16" 937 height="16"
953 increment="1" 938 increment="1"
954 initial_val="0" 939 initial_val="0"
955 max_val="1024" 940 max_val="1024"
956 min_val="0" 941 min_val="0"
957 name="media_reset_time" 942 name="media_reset_time"
958 right="-90" 943 left_delta="126"
959 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)" 944 tool_tip="Amount of time until parcel reverts to default URL (0 for never return)"
960 width="64" /> 945 width="64" />
961 <text 946 <text
@@ -964,12 +949,11 @@ Only large parcels can be listed in search.
964 font="SansSerifSmall" 949 font="SansSerifSmall"
965 halign="left" 950 halign="left"
966 height="16" 951 height="16"
967 left_delta="70" 952 left_delta="72"
968 length="1" 953 length="1"
969 name="minutes" 954 name="minutes"
970 right="-10"
971 type="string"> 955 type="string">
972 Minutes 956 minutes
973 </text> 957 </text>
974 <text 958 <text
975 bottom_delta="-22" 959 bottom_delta="-22"
@@ -1315,20 +1299,6 @@ Select the thumbnail to choose a different texture.
1315 name="music_url" 1299 name="music_url"
1316 right="-15" 1300 right="-15"
1317 select_on_focus="true" /> 1301 select_on_focus="true" />
1318 <check_box
1319 bottom_delta="-25"
1320 enabled="true"
1321 follows="left|top"
1322 font="SansSerifSmall"
1323 height="16"
1324 initial_value="false"
1325 label="Hide URL"
1326 left="80"
1327 mouse_opaque="true"
1328 name="hide_music_url"
1329 radio_style="false"
1330 tool_tip="Checking this option will hide the music URL from any non-authorized viewers of this parcel information."
1331 width="150" />
1332 <text 1302 <text
1333 bottom_delta="-65" 1303 bottom_delta="-65"
1334 follows="left|top" 1304 follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index 3370ea8..47638d5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -117,7 +117,7 @@ sold with objects
117 <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1" 117 <icon follows="top|left" height="64" image_name="badge_ok.j2c" left="0" name="step_1"
118 width="64" /> 118 width="64" />
119 <text bottom_delta="38" follows="top|left" height="16" left="72" 119 <text bottom_delta="38" follows="top|left" height="16" left="72"
120 name="account_action" right="438" width="218" font="SansSerifBig" > 120 name="account_action" right="438" width="218" font="SansSerifLarge" >
121 Upgrade you to premium membership. 121 Upgrade you to premium membership.
122 </text> 122 </text>
123 <text follows="top|left" height="16" left="72" name="account_reason" right="400" 123 <text follows="top|left" height="16" left="72" name="account_reason" right="400"
@@ -139,7 +139,7 @@ sold with objects
139 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 139 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
140 name="step_2" width="64" /> 140 name="step_2" width="64" />
141 <text bottom_delta="38" follows="top|left" height="16" left="72" 141 <text bottom_delta="38" follows="top|left" height="16" left="72"
142 name="land_use_action" right="438" width="218" font="SansSerifBig" > 142 name="land_use_action" right="438" width="218" font="SansSerifLarge" >
143 Increase your monthly land use fees to US$ 40/month. 143 Increase your monthly land use fees to US$ 40/month.
144 </text> 144 </text>
145 <text follows="top|left" height="32" left="72" name="land_use_reason" right="435" 145 <text follows="top|left" height="32" left="72" name="land_use_reason" right="435"
@@ -151,7 +151,7 @@ This parcel is 512 sq.m. of land.
151 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 151 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
152 name="step_3" width="64" /> 152 name="step_3" width="64" />
153 <text bottom_delta="38" follows="top|left" height="16" left="72" 153 <text bottom_delta="38" follows="top|left" height="16" left="72"
154 name="purchase_action" right="438" font="SansSerifBig" > 154 name="purchase_action" right="438" font="SansSerifLarge" >
155 Pay Joe Resident L$ 4000 for the land 155 Pay Joe Resident L$ 4000 for the land
156 </text> 156 </text>
157 <text follows="top|left" height="16" left="72" name="currency_reason" right="400"> 157 <text follows="top|left" height="16" left="72" name="currency_reason" right="400">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
index 9b7355c..f0fb3a3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -1,9 +1,22 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect" 2<floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
3 can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" 3 can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
4 height="350" width="600" min_height="350" min_width="600"> 4 height="410" width="600" min_height="350" min_width="600">
5
6 <check_box control_name="MediaEnableFilter" name="enable_mediafilter" label="Enable Media Filter"
7 initial_value="true" tool_tip="Enables filtering media URLs by domain names."
8 font="SansSerifSmall" mouse_opaque="true"
9 left="14" height="16" bottom_delta="-45" width="4500" follows="left|top" />
10
11 <check_box control_name="MediaFilterOnlyRemoteCommands" name="filter_only_remote"
12 label="Filter only when a script initiates the stream (less secure)" initial_value="false"
13 tool_tip="This will prevent popups asking about URLs that are permanently set on a parcel.
14Only scripted changes to the media URL and scripted requests to start playing a stream will be filtered."
15 font="SansSerifSmall" mouse_opaque="true"
16 left_delta="14" height="16" width="450" follows="left|top" />
17
5 <text name="info1" font="SansSerif" mouse_opaque="true" halign="center" 18 <text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
6 bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top"> 19 bottom_delta="-40" left="20" height="20" width="560" follows="left|right|top">
7 Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted). 20 Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
8 </text> 21 </text>
9 <text name="info2" font="SansSerif" mouse_opaque="true" halign="center" 22 <text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
@@ -14,48 +27,68 @@
14 <scroll_list name="whitelist_list" follows="top|bottom|left" 27 <scroll_list name="whitelist_list" follows="top|bottom|left"
15 background_visible="true" mouse_opaque="true" 28 background_visible="true" mouse_opaque="true"
16 multi_select="false" column_padding="5" draw_border="true" draw_heading="true" 29 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
17 bottom_delta="-205" left="15" height="200" width="280"> 30 bottom_delta="-200" left="15" height="200" width="280">
18 <column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" /> 31 <column name="whitelist_col" label="Allowed domains or server objects" dynamicwidth="true" />
19 </scroll_list> 32 </scroll_list>
20 33
21 <scroll_list name="blacklist_list" follows="top|bottom|right" 34 <scroll_list name="blacklist_list" follows="top|bottom|right"
22 background_visible="true" mouse_opaque="true" 35 background_visible="true" mouse_opaque="true"
23 multi_select="false" column_padding="5" draw_border="true" draw_heading="true" 36 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
24 bottom_delta="0" right="-15" height="200" width="280"> 37 bottom_delta="0" right="-15" height="200" width="280">
25 <column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" /> 38 <column name="blacklist_col" label="Blocked domains or server objects" dynamicwidth="true" />
26 </scroll_list> 39 </scroll_list>
27 40
28 <button name="add_whitelist" font="SansSerif" label="Add..." halign="center" 41 <button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
42 tool_tip="Add a server to the whitelist"
29 enabled="true" mouse_opaque="true" follows="bottom|left" 43 enabled="true" mouse_opaque="true" follows="bottom|left"
30 bottom_delta="-25" left="30" height="20" width="80" /> 44 bottom_delta="-25" left="15" height="20" width="80" />
31 45
32 <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center" 46 <button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
47 tool_tip="Remove the selected server from the whitelist"
33 enabled="true" mouse_opaque="true" follows="bottom|left" 48 enabled="true" mouse_opaque="true" follows="bottom|left"
34 bottom_delta="0" left_delta="100" height="20" width="80" /> 49 bottom_delta="0" left="100" height="20" width="80" />
35 50
36 <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center" 51 <button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
37 enabled="true" mouse_opaque="true" follows="bottom|left|right" 52 tool_tip="Clear all lists"
38 bottom_delta="0" left_delta="110" height="20" width="120" /> 53 enabled="true" mouse_opaque="true" follows="bottom|left"
54 bottom_delta="0" left="205" height="20" width="90" />
55
56 <button name="show_ips" font="SansSerif" label="Show IPs" halign="center"
57 tool_tip="Show the IP associated with each domain name (makes the viewer pause while the list is refreshed, because of DNS lookups)"
58 enabled="true" mouse_opaque="true" follows="bottom|right"
59 bottom_delta="0" right="-205" height="20" width="90" />
39 60
40 <button name="add_blacklist" font="SansSerif" label="Add..." halign="center" 61 <button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
62 tool_tip="Add a server to the blacklist"
41 enabled="true" mouse_opaque="true" follows="bottom|right" 63 enabled="true" mouse_opaque="true" follows="bottom|right"
42 bottom_delta="0" right="-130" height="20" width="80" /> 64 bottom_delta="0" right="-100" height="20" width="80" />
43 65
44 <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center" 66 <button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
67 tool_tip="Remove the selected server from the blacklist"
45 enabled="true" mouse_opaque="true" follows="bottom|right" 68 enabled="true" mouse_opaque="true" follows="bottom|right"
46 bottom_delta="0" right="-30" height="20" width="80" /> 69 bottom_delta="0" right="-15" height="20" width="80" />
47 70
48 <text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true" 71 <text name="add_text" font="SansSerif" mouse_opaque="true"
49 bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom"> 72 bottom_delta="-25" left="20" height="20" width="450" follows="left|right|bottom">
50 New domain: 73 New domain:
51 </text> 74 </text>
52 75
76 <check_box name="match_ip" label="Add/remove matching IP" initial_value="true"
77 tool_tip="Add or remove any IP associated with the added or removed domain name"
78 font="SansSerifSmall" mouse_opaque="true" radio_style="false"
79 bottom_delta="2" right="-95" height="16" width="70" follows="right|bottom" />
80
53 <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false" 81 <line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
82 tool_tip="Enter the new URL, domain name, IP or scripted object HTTP server path here"
54 select_all_on_focus_received="true" select_on_focus="true" 83 select_all_on_focus_received="true" select_on_focus="true"
55 bevel_style="in" border_style="line" border_thickness="1" 84 bevel_style="in" border_style="line" border_thickness="1"
56 bottom_delta="-20" right="-100" height="20" left="15" follows="left|bottom|right"/> 85 bottom_delta="-22" right="-180" height="20" left="15" follows="left|bottom|right"/>
57 86
58 <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false" 87 <button name="cancel_domain" font="SansSerif" label="Cancel" halign="center" enabled="false"
59 mouse_opaque="true" follows="bottom|right" 88 mouse_opaque="true" follows="bottom|right"
60 bottom_delta="0" right="-15" height="20" width="80"/> 89 bottom_delta="0" right="-15" height="20" width="80"/>
90 <button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
91 tool_tip="Add to the list"
92 mouse_opaque="true" follows="bottom|right"
93 bottom_delta="0" right="-95" height="20" width="80"/>
61</floater> 94</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index 939a877..213147a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -18,8 +18,11 @@
18 halign="center" height="20" 18 halign="center" height="20"
19 help_url="http://support.imprudenceviewer.org/" 19 help_url="http://support.imprudenceviewer.org/"
20 label="Support" left="9" mouse_opaque="true" 20 label="Support" left="9" mouse_opaque="true"
21 name="Support" scale_image="true" width="100" /> 21 name="Support" scale_image="true" width="90" />
22 <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455" 22 <button bottom_delta="0" follows="left|bottom" font="SansSerif" height="20" width="160"
23 label="Reset All To Default" name="reset_btn" left_delta="95"
24 tool_tip="Reset all preferences to their default values (requires a restart)" />
25 <tab_container bottom="-476" enabled="true" follows="left|top|right|bottom" height="455"
23 left="0" mouse_opaque="false" name="pref core" tab_group="1" 26 left="0" mouse_opaque="false" name="pref core" tab_group="1"
24 tab_position="left" tab_width="120" width="620" /> 27 tab_position="left" tab_width="120" width="620" />
25</floater> 28</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index d91b5ff..3aeba26 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -27,7 +27,7 @@
27 <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c" 27 <icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
28 left="0" name="step_price" width="64" /> 28 left="0" name="step_price" width="64" />
29 <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label" 29 <text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
30 right="-20" font="SansSerifBig" > 30 right="-20" font="SansSerifLarge" >
31 Set a price: 31 Set a price:
32 </text> 32 </text>
33 <text follows="top|left" height="16" left="72" name="price_text" right="-20"> 33 <text follows="top|left" height="16" left="72" name="price_text" right="-20">
@@ -44,7 +44,7 @@
44 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 44 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
45 name="step_sell_to" width="64" /> 45 name="step_sell_to" width="64" />
46 <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label" 46 <text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
47 right="-20" font="SansSerifBig" > 47 right="-20" font="SansSerifLarge" >
48 Sell the land to: 48 Sell the land to:
49 </text> 49 </text>
50 <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20"> 50 <text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
@@ -69,7 +69,7 @@
69 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0" 69 <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
70 name="step_sell_objects" width="64" /> 70 name="step_sell_objects" width="64" />
71 <text bottom_delta="38" follows="top|left" height="16" left="72" 71 <text bottom_delta="38" follows="top|left" height="16" left="72"
72 name="sell_objects_label" right="-20" font="SansSerifBig" > 72 name="sell_objects_label" right="-20" font="SansSerifLarge" >
73 Sell the objects with the land? 73 Sell the objects with the land?
74 </text> 74 </text>
75 <text bottom_delta="-20" follows="top|left" height="16" left="72" 75 <text bottom_delta="-20" follows="top|left" height="16" left="72"
@@ -89,7 +89,7 @@
89 <button bottom_delta="4" height="16" label="Show Objects" name="show_objects" 89 <button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
90 right="414" width="110" /> 90 right="414" width="110" />
91 <text bottom_delta="-35" follows="top|left" height="16" left="72" 91 <text bottom_delta="-35" follows="top|left" height="16" left="72"
92 name="nag_message_label" right="-20" font="SansSerifBig" > 92 name="nag_message_label" right="-20" font="SansSerifLarge" >
93 REMEMBER: All sales are final. 93 REMEMBER: All sales are final.
94 </text> 94 </text>
95 <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale" 95 <button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
diff --git a/linden/indra/newview/skins/default/xui/en-us/fonts.xml b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
index 7343ac2..e9ede83 100644
--- a/linden/indra/newview/skins/default/xui/en-us/fonts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/fonts.xml
@@ -147,6 +147,10 @@
147 comment="Size of large font (points, or 1/72 of an inch)" 147 comment="Size of large font (points, or 1/72 of an inch)"
148 size="12" 148 size="12"
149 /> 149 />
150 <font_size name="Bigger"
151 comment="Size of medium font (points, or 1/72 of an inch)"
152 size="11"
153 />
150 <font_size name="Medium" 154 <font_size name="Medium"
151 comment="Size of medium font (points, or 1/72 of an inch)" 155 comment="Size of medium font (points, or 1/72 of an inch)"
152 size="10" 156 size="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
index e95b371..f0ba830 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml
@@ -431,6 +431,17 @@
431 media_plugin_gstreamer 431 media_plugin_gstreamer
432 </impl> 432 </impl>
433 </mimetype> 433 </mimetype>
434 <mimetype name="video/x-m4v">
435 <label name="video/m4v_label">
436 Movie (M4V)
437 </label>
438 <widgettype>
439 movie
440 </widgettype>
441 <impl>
442 media_plugin_gstreamer
443 </impl>
444 </mimetype>
434 <mimetype menu="1" name="video/quicktime"> 445 <mimetype menu="1" name="video/quicktime">
435 <label name="video/quicktime_label"> 446 <label name="video/quicktime_label">
436 Movie (QuickTime) 447 Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
index 7931e55..e1751eb 100755
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml
@@ -431,6 +431,17 @@
431 media_plugin_quicktime 431 media_plugin_quicktime
432 </impl> 432 </impl>
433 </mimetype> 433 </mimetype>
434 <mimetype name="video/x-m4v">
435 <label name="video/m4v_label">
436 Movie (M4V)
437 </label>
438 <widgettype>
439 movie
440 </widgettype>
441 <impl>
442 media_plugin_gstreamer
443 </impl>
444 </mimetype>
434 <mimetype menu="1" name="video/quicktime"> 445 <mimetype menu="1" name="video/quicktime">
435 <label name="video/quicktime_label"> 446 <label name="video/quicktime_label">
436 Movie (QuickTime) 447 Movie (QuickTime)
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
index 5ee4ed0..26491e0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml
@@ -428,8 +428,19 @@
428 movie 428 movie
429 </widgettype> 429 </widgettype>
430 <impl> 430 <impl>
431 media_plugin_quicktime 431 media_plugin_quicktime
432 </impl> 432 </impl>
433 </mimetype>
434 <mimetype name="video/x-m4v">
435 <label name="video/m4v_label">
436 Movie (M4V)
437 </label>
438 <widgettype>
439 movie
440 </widgettype>
441 <impl>
442 media_plugin_gstreamer
443 </impl>
433 </mimetype> 444 </mimetype>
434 <mimetype menu="1" name="video/quicktime"> 445 <mimetype menu="1" name="video/quicktime">
435 <label name="video/quicktime_label"> 446 <label name="video/quicktime_label">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 320ed18..97a020d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7176,6 +7176,25 @@ IM history could not be found for [NAME].
7176</notification> 7176</notification>
7177 7177
7178<notification 7178<notification
7179 icon="alertmodal.tga"
7180 name="InvalidLogInSecondLife"
7181 type="alertmodal">
7182Oops! The login name you entered wasn't formatted correctly!
7183
7184[SECOND_LIFE] accepts the following login formats:
7185
7186 - username
7187 - username.Resident
7188 - firstname.lastname
7189
7190If you don't have an account, would you like to create one now?
7191 <usetemplate
7192 name="okcancelbuttons"
7193 notext="Try again"
7194 yestext="Create an account"/>
7195</notification>
7196
7197<notification
7179 icon="alert.tga" 7198 icon="alert.tga"
7180 name="ShowLookAtInfo" 7199 name="ShowLookAtInfo"
7181 type="alert"> 7200 type="alert">
@@ -7303,11 +7322,15 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
7303 icon="alert.tga" 7322 icon="alert.tga"
7304 name="MediaAlert" 7323 name="MediaAlert"
7305 type="alert"> 7324 type="alert">
7306The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]: 7325The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
7326
7327[URL]
7328
7329You may choose to allow or deny the corresponding domain or in-world scripted object server:
7307 7330
7308[DOMAIN] 7331[DOMAIN]
7309 7332
7310"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object. 7333"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
7311 <form name="form"> 7334 <form name="form">
7312 <button 7335 <button
7313 index="0" 7336 index="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 21d914b..0895e3f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -21,7 +21,7 @@ Hover your mouse over the options for more help.
21 prevalidate="ascii" v_pad="0" width="300" spell_check="true" /> 21 prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
22 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 22 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
23 bottom="-20" drop_shadow_visible="true" follows="left|top" 23 bottom="-20" drop_shadow_visible="true" follows="left|top"
24 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 24 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
25 mouse_opaque="true" name="group_name" v_pad="0" width="300"> 25 mouse_opaque="true" name="group_name" v_pad="0" width="300">
26 Type your new group name here 26 Type your new group name here
27 </text> 27 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index 9341d4b..b5f7b37 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -18,7 +18,7 @@
18 </string> 18 </string>
19 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 19 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
20 bottom="-20" drop_shadow_visible="true" follows="left|top" 20 bottom="-20" drop_shadow_visible="true" follows="left|top"
21 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 21 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
22 mouse_opaque="true" name="group_land_heading" v_pad="0" width="150"> 22 mouse_opaque="true" name="group_land_heading" v_pad="0" width="150">
23 Group Owned Land 23 Group Owned Land
24 </text> 24 </text>
@@ -105,7 +105,7 @@
105 </text> 105 </text>
106 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 106 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
107 bottom_delta="-25" drop_shadow_visible="true" follows="left|top" 107 bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
108 font="SansSerifBig" h_pad="0" halign="left" height="16" left="12" 108 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="12"
109 mouse_opaque="true" name="group_money_heading" v_pad="0" width="150"> 109 mouse_opaque="true" name="group_money_heading" v_pad="0" width="150">
110 Group [CURRENCY] 110 Group [CURRENCY]
111 </text> 111 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
index bca87d9..e6d7604 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_notices.xml
@@ -15,7 +15,7 @@ the General tab.
15 <button bottom="-24" font="SansSerif" halign="center" height="16" label="?" 15 <button bottom="-24" font="SansSerif" halign="center" height="16" label="?"
16 label_selected="?" left="391" name="help_button" width="20" /> 16 label_selected="?" left="391" name="help_button" width="20" />
17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 17 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-20" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 18 bottom="-20" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
19 halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0" 19 halign="left" height="16" left="7" mouse_opaque="true" name="lbl" v_pad="0"
20 width="436"> 20 width="436">
21 Group Notices Archive 21 Group Notices Archive
@@ -51,7 +51,7 @@ Notice lists are limited to 200 notices per group on a daily basis.
51 <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice" 51 <panel border="false" bottom="0" follows="all" height="268" label="Create New Notice"
52 left="1" mouse_opaque="true" name="panel_create_new_notice" width="418"> 52 left="1" mouse_opaque="true" name="panel_create_new_notice" width="418">
53 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 53 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
54 bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 54 bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
55 halign="left" height="16" left="7" mouse_opaque="false" name="lbl" 55 halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
56 v_pad="0" width="436"> 56 v_pad="0" width="436">
57 Create a Notice 57 Create a Notice
@@ -115,7 +115,7 @@ and you can&apos;t send a folder.
115 <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice" 115 <panel border="false" bottom="0" follows="all" height="268" label="View Past Notice"
116 left="1" mouse_opaque="true" name="panel_view_past_notice" width="418"> 116 left="1" mouse_opaque="true" name="panel_view_past_notice" width="418">
117 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 117 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
118 bottom="-18" drop_shadow_visible="true" font="SansSerifBig" h_pad="0" 118 bottom="-18" drop_shadow_visible="true" font="SansSerifLarge" h_pad="0"
119 halign="left" height="16" left="7" mouse_opaque="false" name="lbl" 119 halign="left" height="16" left="7" mouse_opaque="false" name="lbl"
120 v_pad="0" width="436"> 120 v_pad="0" width="436">
121 Archived Notice 121 Archived Notice
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index e5b621e..014b28d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -12,7 +12,7 @@
12 name="help_button" width="20" /> 12 name="help_button" width="20" />
13 <panel border="false" bottom="-24" height="24" left="7" name="members_header" 13 <panel border="false" bottom="-24" height="24" left="7" name="members_header"
14 visible="true" width="380"> 14 visible="true" width="380">
15 <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0" 15 <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
16 name="static" width="150"> 16 name="static" width="150">
17 Members &amp; Roles 17 Members &amp; Roles
18 </text> 18 </text>
@@ -24,7 +24,7 @@ easily be customized, allowing for greater organization and flexibility.
24 </panel> 24 </panel>
25 <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header" 25 <panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
26 visible="false" width="380"> 26 visible="false" width="380">
27 <text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0" 27 <text bottom_delta="-20" font="SansSerifLarge" halign="left" height="16" left="0"
28 name="static" width="100"> 28 name="static" width="100">
29 Roles 29 Roles
30 </text> 30 </text>
@@ -47,7 +47,7 @@ easily be customized, allowing for greater organization and flexibility.
47 </panel> 47 </panel>
48 <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header" 48 <panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
49 visible="false" width="380"> 49 visible="false" width="380">
50 <text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0" 50 <text bottom_delta="0" font="SansSerifLarge" halign="left" height="16" left="0"
51 name="static" width="200"> 51 name="static" width="200">
52 Abilities 52 Abilities
53 </text> 53 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
index 168b60b..64be465 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_voting.xml
@@ -20,7 +20,7 @@ vote on open proposals, and view old proposals.
20 name="help_button" width="20" /> 20 name="help_button" width="20" />
21 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 21 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
22 bottom="446" drop_shadow_visible="true" follows="left|top" 22 bottom="446" drop_shadow_visible="true" follows="left|top"
23 font="SansSerifBig" h_pad="0" halign="left" height="16" left="7" 23 font="SansSerifLarge" h_pad="0" halign="left" height="16" left="7"
24 mouse_opaque="false" name="proposal_header" v_pad="0" width="363"> 24 mouse_opaque="false" name="proposal_header" v_pad="0" width="363">
25 Open Group Proposals 25 Open Group Proposals
26 </text> 26 </text>
@@ -144,7 +144,7 @@ vote on open proposals, and view old proposals.
144 mouse_opaque="true" name="btn_abstain" width="63" /> 144 mouse_opaque="true" name="btn_abstain" width="63" />
145 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 145 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
146 bottom="-240" drop_shadow_visible="true" follows="left|top" 146 bottom="-240" drop_shadow_visible="true" follows="left|top"
147 font="SansSerifBig" h_pad="0" halign="left" height="10" left="12" 147 font="SansSerifLarge" h_pad="0" halign="left" height="10" left="12"
148 mouse_opaque="false" name="txt" v_pad="0" width="363"> 148 mouse_opaque="false" name="txt" v_pad="0" width="363">
149 Group Voting History 149 Group Voting History
150 </text> 150 </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 75c635e..f43fc7a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -148,6 +148,26 @@
148 mouse_opaque="true" scale_image="TRUE" /> 148 mouse_opaque="true" scale_image="TRUE" />
149 149
150 150
151 <!-- SL USERNAME -->
152
153 <text name="username_text"
154 bottom="80" left="24" height="16" width="250"
155 follows="left|bottom" h_pad="0" halign="left" v_pad="0"
156 bg_visible="false" drop_shadow_visible="true"
157 border_visible="false" border_drop_shadow_visible="false"
158 font="SansSerif" mouse_opaque="true">
159 Login name:
160 </text>
161 <line_editor name="username_edit"
162 bottom_delta="-20" left_delta="0" height="20" width="250"
163 follows="left|bottom" font="SansSerif"
164 bevel_style="in" border_style="line" border_thickness="1"
165 max_length="31" mouse_opaque="true"
166 handle_edit_keys_directly="true"
167 select_all_on_focus_received="true"
168 allow_translate="false" />
169
170
151 <!-- ACCOUNT / FORGOT PASSWORD --> 171 <!-- ACCOUNT / FORGOT PASSWORD -->
152 172
153 <text name="create_new_account_text" 173 <text name="create_new_account_text"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 1b771b5..b8f6e7d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -128,9 +128,6 @@
128 </combo_item> 128 </combo_item>
129 </combo_box>--> 129 </combo_box>-->
130 130
131 <button bottom="10" follows="left|bottom" font="SansSerif" height="20" width="250"
132 label="Reset All Preferences To Default" name="reset_btn" left="12"
133 tool_tip="Reset all preferences to their default values (requires a restart)" />
134 </panel> 131 </panel>
135 132
136 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck" 133 <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="SpellCheck"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index c6bb938..355d7e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,13 +9,13 @@
9 Volume: 9 Volume:
10 </text> 10 </text>
11 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 11 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
12 bottom="-190" drop_shadow_visible="true" enabled="true" follows="left|top" 12 bottom="-202" drop_shadow_visible="true" enabled="true" follows="left|top"
13 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 13 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
14 mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128"> 14 mouse_opaque="true" name="streaming_prefs_text" v_pad="0" width="128">
15 Streaming: 15 Streaming:
16 </text> 16 </text>
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-285" drop_shadow_visible="true" enabled="true" follows="left|top" 18 bottom="-315" drop_shadow_visible="true" enabled="true" follows="left|top"
19 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 19 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
20 mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128"> 20 mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
21 Audio: 21 Audio:
@@ -42,7 +42,21 @@
42 initial_value="true" label="Automatically play media" left="162" 42 initial_value="true" label="Automatically play media" left="162"
43 mouse_opaque="true" name="auto_streaming_video" radio_style="false" 43 mouse_opaque="true" name="auto_streaming_video" radio_style="false"
44 width="338" /> 44 width="338" />
45 <check_box bottom_delta="-27" control_name="MuteWhenMinimized" enabled="true" 45 <check_box bottom_delta="-20" control_name="MediaOnAPrimUI" enabled="true"
46 follows="left|top" font="SansSerifSmall" height="16"
47 initial_value="true" label="Media helper widget" left="162"
48 mouse_opaque="true" name="media_helper_widget" radio_style="false"
49 width="338" />
50 <check_box bottom_delta="-20" control_name="MediaEnableFilter" enabled="true"
51 follows="left|top" font="SansSerifSmall" height="16"
52 initial_value="true" label="Filter media URLs" left="142"
53 mouse_opaque="true" name="enable_media_filter" radio_style="false"
54 width="200" />
55 <button name="show_media_filter" font="SansSerif" label="Media Filter Settings" halign="center"
56 tool_tip="Edit settings and the blocked and allowed lists for the Media Filter."
57 enabled="false" mouse_opaque="true" follows="top|right"
58 bottom_delta="-2" right="-15" height="20" width="180" />
59 <check_box bottom_delta="-33" control_name="MuteWhenMinimized" enabled="true"
46 follows="left|top" font="SansSerifSmall" height="16" initial_value="true" 60 follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
47 label="Mute audio when window minimized" left="142" mouse_opaque="true" 61 label="Mute audio when window minimized" left="142" mouse_opaque="true"
48 name="mute_when_minimized" radio_style="false" width="215" /> 62 name="mute_when_minimized" radio_style="false" width="215" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 1e4ded6..86aa353 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -64,4 +64,31 @@
64 increment="1" initial_val="13000" label="Port number:" label_width="75" 64 increment="1" initial_val="13000" label="Port number:" label_width="75"
65 left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true" 65 left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
66 name="connection_port" width="150" /> 66 name="connection_port" width="150" />
67 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
68 bottom_delta="-24" drop_shadow_visible="true" enabled="true"
69 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
70 height="10" left="15" mouse_opaque="false" name="proxy_label" v_pad="0"
71 width="250">
72 XMLRPC Proxy (Login, Land- and Money purchase):
73 </text>
74 <check_box bottom_delta="-25" enabled="true"
75 follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
76 label="Enable XMLRPC proxy" left_delta="199" mouse_opaque="true"
77 name="xmlrpc_proxy_enabled" radio_style="false" width="256" />
78 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
79 bottom_delta="-25" drop_shadow_visible="true" enabled="true"
80 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
81 height="10" left="140" mouse_opaque="false" name="xmlrpc_proxy_text_label"
82 v_pad="0" width="128">
83 Address:
84 </text>
85 <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
86 height="20" left="217" name="xmlrpc_proxy_editor"
87 tool_tip="The name or IP address of the proxy you would like to use"
88 width="200" />
89 <spinner bottom_delta="-25" decimal_digits="0"
90 enabled="true" follows="left|top" height="16" increment="1"
91 initial_val="80" label="Port number:" label_width="75" left="140"
92 max_val="12000" min_val="10" mouse_opaque="true" name="xmlrpc_proxy_port"
93 width="140" />
67</panel> 94</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index e077ca1..d855a6f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -34,6 +34,10 @@
34 font="SansSerifSmall" height="16" initial_value="false" 34 font="SansSerifSmall" height="16" initial_value="false"
35 label="Accept cookies from sites" left="140" mouse_opaque="true" 35 label="Accept cookies from sites" left="140" mouse_opaque="true"
36 name="cookies_enabled" radio_style="false" width="256" /> 36 name="cookies_enabled" radio_style="false" width="256" />
37 <button bottom_delta="-20" enabled="true" follows="left|top" font="SansSerif"
38 halign="center" height="18" label="Clear Cookies" left_delta="0"
39 tool_tip="Clear Cookies"
40 mouse_opaque="true" name="clear_ookies" scale_image="true" width="110" />
37 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 41 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
38 bottom_delta="-24" drop_shadow_visible="true" enabled="true" 42 bottom_delta="-24" drop_shadow_visible="true" enabled="true"
39 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" 43 follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
generated by cgit v1.1 at 2025-01-09 12:32:29 +0000