diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 09:56:48 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-19 09:56:48 +0100 |
commit | b550bb0f09197c35b80d18d540761a7831c3e89b (patch) | |
tree | d86f5574202c7415c93fc45c7a5cd1f7fe892d06 /indra/newview/skins/default | |
parent | 8e474b095a9d228d62101540433937abdf623842 (diff) | |
parent | a4fc76a0f749e07d703ddb7ed923d7c4ea94ab7e (diff) |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/skins/default')
5 files changed, 15 insertions, 5 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 0540a03e25..33668f5ed6 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -530,7 +530,7 @@ reference="Unused?" /> <color name="NetMapBackgroundColor" - value="0 0 0 0" /> + value="0 0 0 1" /> <color name="NetMapGroupOwnAboveWater" reference="Purple" /> diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml index e21e44204d..249b091800 100644 --- a/indra/newview/skins/default/xui/en/floater_map.xml +++ b/indra/newview/skins/default/xui/en/floater_map.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater bg_alpha_image_overlay="DkGray_66" - legacy_header_height="18" + legacy_header_height="0" can_minimize="true" can_resize="true" follows="top|right" @@ -10,7 +10,7 @@ min_height="174" min_width="174" name="Map" - title="Mini Map" + title="" help_topic="map" save_rect="true" save_visibility="true" @@ -62,8 +62,8 @@ mouse_opaque="false" name="Net Map" width="200" - height="200" - top="18"/> + height="218" + top="0"/> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index a53774a492..ad40cafe61 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -537,6 +537,7 @@ <button follows="right|bottom" height="23" + image_unselected="PushButton_On" label="Teleport" layout="topleft" left="25" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4b31a1a0ad..300437b3c9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6118,6 +6118,12 @@ The button will be shown when there is enough space for it. type="notifytip"> Drag items from inventory onto a person in the resident picker </notification> + <notification + icon="notifytip.tga" + name="DeedToGroupFail" + type="notifytip"> +Deed to group failed. + </notification> <notification icon="notifytip.tga" diff --git a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml index afcd4550ca..40fcc1d76c 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_wearable.xml @@ -175,6 +175,7 @@ left="0" value="Shape:" width="150" /> <radio_group + control_name="AvatarSex" follows="left|top|right" left="210" height="20" @@ -190,6 +191,7 @@ left="0" left="0" name="sex_male" tool_tip="Male" + value="1" width="40" /> <radio_item follows="all" @@ -199,6 +201,7 @@ left="0" left_pad="10" name="sex_female" tool_tip="Female" + value="0" width="40" /> </radio_group> <!-- graphical labels for the radio buttons above --> |