summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-14 17:57:13 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-14 17:57:13 -0800
commit77aa787c019615d2fe68d31aa07434301535c992 (patch)
treeabac2890b34292e3498d21e262b9fed17d5cdc8d /indra/newview/skins/default
parentcee8909ee4c4dc67f55962ef7b547465a1820437 (diff)
parentc063647b58a97a7375a92b36564607d4c6abcad7 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_about_land.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_media_browser.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_general.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_media_settings_security.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml11
5 files changed, 18 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 10b72144e7..1239152c32 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1561,7 +1561,7 @@ Only large parcels can be listed in search.
left="10"
name="at URL:"
width="100">
- Home URL:
+ Home Page:
</text>
<line_editor
follows="left|top"
@@ -1590,7 +1590,7 @@ Only large parcels can be listed in search.
left="10"
name="CurrentURL:"
width="100">
- Current URL:
+ Current Page:
</text>
<button
follows="top|right"
diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index d6b20c8015..4b280ac59f 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -171,7 +171,7 @@
enabled="false"
follows="left|top"
height="20"
- label="Send Current URL to Parcel"
+ label="Send Current Page to Parcel"
layout="topleft"
left="0"
name="assign"
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 c8ec515e6d..5217ab3571 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
@@ -17,7 +17,7 @@
height="15"
left="10"
name="home_label">
- Home URL:
+ Home Page:
</text>
<text
visible="false"
@@ -27,7 +27,7 @@
left_delta="64"
text_color="red"
name="home_fails_whitelist_label">
- (This URL does not pass the specified whitelist)
+ (This page does not pass the specified whitelist)
</text>
<line_editor
bottom_delta="-24"
@@ -37,7 +37,7 @@
height="20"
left="10"
name="home_url"
- tool_tip="The home URL for this media source"
+ tool_tip="The home page for this media source"
width="340">
<!-- <line_editor.commit_callback
function="Media.CommitHomeURL"/> -->
@@ -69,7 +69,7 @@
height="15"
left="10"
name="current_url_label">
- Current URL:
+ Current Page:
</text>
<text
bottom_delta="-20"
@@ -79,7 +79,7 @@
height="20"
left="10"
name="current_url"
- tool_tip="The current URL for this media source"
+ tool_tip="The current page for this media source"
value=""
width="340" />
<button
diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
index 6e82713f06..1f41a0d284 100644
--- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
+++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml
@@ -48,7 +48,7 @@
bottom_delta="0"
text_color="0.4 0.4 0.4 1.0"
name="home_url_fails_some_items_in_whitelist">
- Entries that the home URL fails against are marked:
+ Entries that the home page fails against are marked:
</text>
<button
bottom_delta="-36"
@@ -82,7 +82,7 @@
left="30"
text_color="0.6 0.0 0.0 1.0"
name="home_url_fails_whitelist">
-Warning: the home URL specified in the General tab
+Warning: the home page specified in the General tab
fails to pass this whitelist. It has been disabled
until a valid entry has been added.
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index b4f72a48bc..bffb28d16e 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -9,7 +9,7 @@
width="800">
<string name="control_background_image_name">Inspector_Background</string>
<string name="skip_step">0.2</string>
- <string name="min_width">400</string>
+ <string name="min_width">300</string>
<string name="min_height">120</string>
<string name="zoom_near_padding">1.0</string>
<string name="zoom_medium_padding">1.25</string>
@@ -190,7 +190,7 @@
layout="topleft"
top="14"
min_width="22"
- width="22">
+ width="24">
<button
image_overlay="Play_Off"
image_disabled="PushButton_Disabled"
@@ -200,6 +200,8 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip = "Play media"
+ left_delta="2"
+ top="4"
height="22"
min_width="22"
width="22">
@@ -214,7 +216,7 @@
layout="topleft"
top="18"
min_width="22"
- width="22">
+ width="24">
<button
image_overlay="Pause_Off"
image_disabled="PushButton_Disabled"
@@ -224,6 +226,9 @@
hover_glow_amount="0.15"
layout="topleft"
height="22"
+ width="22"
+ left_delta="-1"
+ top="4"
tool_tip = "Pause media">
<button.commit_callback
function="MediaCtrl.Pause" />