summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_grid_status.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_web_content.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_active_object_row.xml20
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml3
6 files changed, 7 insertions, 26 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_grid_status.xml b/indra/newview/skins/default/xui/en/floater_grid_status.xml
index b97bd8056d..bf78204282 100644
--- a/indra/newview/skins/default/xui/en/floater_grid_status.xml
+++ b/indra/newview/skins/default/xui/en/floater_grid_status.xml
@@ -12,7 +12,6 @@
save_rect="true"
save_visibility="true"
title=""
- initial_mime_type="text/html"
width="780"
tab_stop="true"
filename="floater_web_content.xml"/>
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml
index 4473ce0cda..fe9ffba6cd 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -10,7 +10,6 @@
help_topic="floater_web_content"
save_rect="true"
title=""
- initial_mime_type="text/html"
width="780">
<layout_stack
bottom="775"
diff --git a/indra/newview/skins/default/xui/en/panel_active_object_row.xml b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
index 3e3271b181..656171ff96 100644
--- a/indra/newview/skins/default/xui/en/panel_active_object_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_active_object_row.xml
@@ -18,15 +18,7 @@
left="5"
height="25"
width="25"
- visible="false"
- speaker.name="speaker_p2p"
- speaker.width="20"
- speaker.height="25"
- speaker.left="25"
- speaker.top="25"
- speaker.auto_update="true"
- speaker.draw_border="false"
- speaker.visible="false">
+ visible="false">
</chiclet_script>
<chiclet_offer
name="inv_offer_chiclet"
@@ -36,15 +28,7 @@
left="5"
height="25"
width="25"
- visible="false"
- speaker.name="speaker_p2p"
- speaker.width="20"
- speaker.height="25"
- speaker.left="25"
- speaker.top="25"
- speaker.auto_update="true"
- speaker.draw_border="false"
- speaker.visible="false">
+ visible="false">
</chiclet_offer>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
index e844a15118..2316beeb36 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml
@@ -193,7 +193,7 @@
follows="left|top"
height="16"
increment="1"
- initial_val="256"
+ initial_value="256"
label=""
label_width="0"
left_delta="68"
@@ -213,7 +213,7 @@
follows="left|top"
height="16"
increment="1"
- initial_val="256"
+ initial_value="256"
label=""
label_width="0"
left_delta="20"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 0cd56af6d7..83ce912c77 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -32,7 +32,7 @@
height="23"
increment="64"
initial_value="1024"
- label="Cache size (64 - 9984MB)"
+ label="Cache size (256 - 9984MB)"
label_width="150"
layout="topleft"
left="80"
@@ -87,7 +87,7 @@
height="23"
layout="topleft"
left="80"
- max_length="4096"
+ max_length_bytes="4096"
name="cache_location"
top_pad="5"
width="205" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 78f771cd51..9e7023d2f2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
border="true"
- has_border="true"
height="408"
label="Text Chat"
layout="topleft"
@@ -541,7 +540,7 @@
height="23"
layout="topleft"
left_pad="55"
- max_length="4096"
+ max_length_bytes="4096"
name="log_path_string"
top_delta="-5"
width="185">