livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync with viewer-development

meow-7.2.2
eli 2011-09-01 15:20:36 -07:00
parent 59fbf6bfa5
commit 6ba3952edf
8 changed files with 183 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/skins/default/xui/en/floater_postcard.xml
View File

@ -7,11 +7,11 @@
height="380"
layout="topleft"
min_height="380"
min_width="450"
min_width="490"
name="Postcard"
help_topic="postcard"
title="EMAIL SNAPSHOT"
width="450">
width="490">
<floater.string
name="default_subject">
Postcard from [SECOND_LIFE].
@ -40,7 +40,7 @@
follows="left|top"
height="20"
layout="topleft"
left_delta="108"
left_delta="148"
name="to_form"
top_delta="-4"
width="150" />
@ -59,7 +59,7 @@
follows="left|top"
height="20"
layout="topleft"
left_delta="108"
left_delta="148"
name="from_form"
top_delta="-4"
width="150" />
@ -78,7 +78,7 @@
follows="left|top"
height="20"
layout="topleft"
left_delta="108"
left_delta="148"
max_length_bytes="100"
name="name_form"
top_delta="-4"
@ -99,7 +99,7 @@
height="20"
label="Type your subject here."
layout="topleft"
left_delta="108"
left_delta="148"
max_length_bytes="100"
name="subject_form"
top_delta="-4"

140
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -6260,6 +6260,10 @@ Grant this request?
[NAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
[MESSAGE]
<form name="form">
<button
index="-2"
name="Mute"
text="Block"/>
<button
index="-1"
name="Ignore"
@ -6275,6 +6279,10 @@ Grant this request?
[GROUPNAME]&apos;s &apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos;
[MESSAGE]
<form name="form">
<button
index="-2"
name="Mute"
text="Block"/>
<button
index="-1"
name="Ignore"
@ -7156,6 +7164,138 @@ Click and drag anywhere on the world to rotate your view
</form>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_NOT_PERMITTED"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, not allowed by rule set.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_CONNECT_ERROR"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the connection, could not open TCP channel.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_NOT_ACCEPTABLE"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the selected authentication system.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_AUTH_FAIL"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" reported your credentials are invalid.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_UDP_FWD_NOT_GRANTED"
type="alertmodal">
The SOCKS 5 proxy "[HOST]:[PORT]" refused the UDP associate request.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_HOST_CONNECT_FAILED"
type="alertmodal">
Could not connect to SOCKS 5 proxy server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_UNKNOWN_STATUS"
type="alertmodal">
Unknown proxy error with server "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_INVALID_HOST"
type="alertmodal">
Invalid SOCKS proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SOCKS_BAD_CREDS"
type="alertmodal">
Invalid SOCKS 5 username or password.
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PROXY_INVALID_HTTP_HOST"
type="alertmodal">
Invalid HTTP proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="PROXY_INVALID_SOCKS_HOST"
type="alertmodal">
Invalid SOCKS proxy address or port "[HOST]:[PORT]".
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="ChangeProxySettings"
type="alert">
Proxy settings take effect after you restart [APP_NAME].
<tag>fail</tag>
<usetemplate
name="okbutton"
yestext="OK"/>
</notification>
<notification
name="AuthRequest"
type="browser">

2
indra/newview/skins/default/xui/en/panel_cof_wearables.xml
View File

@ -52,7 +52,7 @@
multi_select="true"
name="list_attachments"
top="0"
width="311"/>
width="311" />
</accordion_tab>
<accordion_tab
layout="topleft"

3
indra/newview/skins/default/xui/en/panel_login.xml
View File

@ -117,12 +117,13 @@ label="Remember password"
name="connect_btn"
top="35"
width="90" />
<!-- Utf code in label is a filled up-pointing triangle -->
<menu_button
left_pad="5"
top="35"
width="80"
height="23"
label="Mode ▲"
label="Mode &#9650;"
name="mode_menu"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
menu_filename="menu_mode_change.xml"

2
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -139,7 +139,7 @@
height="16"
label="Add datestamp to log file name."
layout="topleft"
left_detla="5"
left_delta="5"
name="logfile_name_datestamp"
top_pad="10"
width="350"/>

85
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
View File

@ -70,7 +70,7 @@
layout="topleft"
left="77"
name="connection_port_enabled"
top_pad="20"
top_pad="10"
width="256">
<check_box.commit_callback
function="Notification.Show"
@ -79,7 +79,7 @@
<spinner
control_name="ConnectionPort"
enabled_control="ConnectionPortEnabled"
decimal_digits="0"
decimal_digits="0"
follows="left|top"
height="23"
increment="1"
@ -195,60 +195,6 @@
name="media_popup_enabled"
width="400"
top_pad="5"/>
<check_box
top_delta="4"
enabled="true"
follows="left|top"
height="14"
initial_value="false"
control_name="BrowserProxyEnabled"
label="Enable Web Proxy"
left_delta="0"
mouse_opaque="true"
name="web_proxy_enabled"
radio_style="false"
width="400" top_pad="5"/>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="20"
name="Proxy location"
top_delta="16"
width="300">
Proxy location:
</text>
<line_editor
control_name="BrowserProxyAddress"
enabled_control="BrowserProxyEnabled"
follows="left|top"
font="SansSerif"
height="23"
layout="topleft"
left_delta="0"
name="web_proxy_editor"
tool_tip="The name or IP address of the proxy you would like to use"
top_pad="4"
width="200" />
<spinner
control_name="BrowserProxyPort"
enabled_control="BrowserProxyEnabled"
decimal_digits="0"
follows="left|top"
height="23"
increment="1"
initial_value="80"
label="Port number:"
label_width="95"
layout="topleft"
left_delta="210"
max_val="12000"
min_val="10"
name="web_proxy_port"
top_delta="0"
width="145" />
<text
type="string"
length="1"
@ -286,4 +232,31 @@
name="Install_manual"
value="0" />
</combo_box>
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left="30"
name="Proxy Settings:"
mouse_opaque="false"
top_pad="5"
width="300">
Proxy Settings:
</text>
<button
label="Adjust proxy settings"
follows="left|top"
height="23"
width="140"
label_selected="Browse"
layout="topleft"
left_delta="50"
name="set_proxy"
top_pad="5"
>
<button.commit_callback
function="Pref.Proxy" />
</button>
</panel>

2
indra/newview/skins/default/xui/en/panel_region_terrain.xml
View File

@ -193,7 +193,7 @@
</text>
<text
follows="left|top"
height="20"
height="60"
layout="topleft"
left_delta="0"
name="height_text_lbl11"

5
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -77,15 +77,16 @@
top="0"
width="55" />
</panel>
<!-- UTF 9660 code in label below is a down-pointing filled-in triangle -->
<menu_button
follows="right|top"
image_color="0 0 0 0"
hover_glow_amount="0"
left_pad="5"
top="0"
top="2"
width="55"
height="18"
label="Mode ▼"
label="Mode &#9660;"
tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features."
menu_filename="menu_mode_change.xml"
/>