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

Merge

meow-7.2.2
James Cook 2009-12-17 16:11:01 -08:00
parent 6e17110201 45f8ced1df
commit 9cd338c1f3
9 changed files with 305 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/skins/default/colors.xml
View File

@ -59,9 +59,6 @@
<color
name="Red"
value="1 0 0 1" />
<color
name="Green"
value="0 1 0 1" />
<color
name="Blue"
value="0 0 1 1" />
@ -69,8 +66,8 @@
name="Yellow"
value="0.114 0.65 0.1" />
<color
name="Unused?"
value="1 0.5 0 1" />
name="Green"
value="0 .39 .10 1" />
<color
name="Transparent"
value="0 0 0 0" />
@ -435,7 +432,7 @@
reference="DkGray" />
<color
name="MenuBarGodBgColor"
reference="DkGray2" />
reference="Green" />
<color
name="MenuDefaultBgColor"
reference="DkGray2" />

508
indra/newview/skins/default/xui/en/floater_customize.xml
View File

File diff suppressed because it is too large Load Diff

10
indra/newview/skins/default/xui/en/panel_notes.xml
View File

@ -114,7 +114,7 @@
width="313">
<button
follows="bottom|left"
height="19"
height="23"
label="Add"
layout="topleft"
left="0"
@ -125,7 +125,7 @@
width="55" />
<button
follows="bottom|left"
height="19"
height="23"
label="IM"
layout="topleft"
name="im"
@ -135,7 +135,7 @@
width="40" />
<button
follows="bottom|left"
height="19"
height="23"
label="Call"
layout="topleft"
name="call"
@ -146,7 +146,7 @@
<button
enabled="false"
follows="bottom|left"
height="19"
height="23"
label="Map"
layout="topleft"
name="show_on_map_btn"
@ -156,7 +156,7 @@
width="50" />
<button
follows="bottom|left"
height="19"
height="23"
label="Teleport"
layout="topleft"
name="teleport"

14
indra/newview/skins/default/xui/en/panel_people.xml
View File

@ -346,7 +346,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left="0"
height="19"
height="23"
label="Profile"
layout="topleft"
name="view_profile_btn"
@ -356,7 +356,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left_pad="2"
height="19"
height="23"
label="IM"
layout="topleft"
name="im_btn"
@ -366,7 +366,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left_pad="2"
height="19"
height="23"
label="Call"
layout="topleft"
name="call_btn"
@ -376,7 +376,7 @@ background_visible="true"
follows="left|top"
top="4"
left_pad="2"
height="19"
height="23"
label="Share"
layout="topleft"
name="share_btn"
@ -385,7 +385,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left_pad="2"
height="19"
height="23"
label="Teleport"
layout="topleft"
name="teleport_btn"
@ -395,7 +395,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left="0"
height="19"
height="23"
label="Group Profile"
layout="topleft"
name="group_info_btn"
@ -405,7 +405,7 @@ background_visible="true"
follows="bottom|left"
top="4"
left_pad="2"
height="19"
height="23"
label="Group Chat"
layout="topleft"
name="chat_btn"

6
indra/newview/skins/default/xui/en/panel_pick_info.xml
View File

@ -103,7 +103,7 @@
name="buttons">
<button
follows="bottom|left"
height="19"
height="23"
label="Teleport"
layout="topleft"
left="0"
@ -112,7 +112,7 @@
width="90" />
<button
follows="bottom|left"
height="19"
height="23"
label="Map"
layout="topleft"
left_pad="10"
@ -121,7 +121,7 @@
width="90" />
<button
follows="bottom|left"
height="19"
height="23"
label="Edit"
layout="topleft"
right="-1"

6
indra/newview/skins/default/xui/en/panel_picks.xml
View File

@ -129,7 +129,7 @@
<button
enabled="false"
follows="bottom|left"
height="25"
height="23"
label="Info"
layout="topleft"
left="5"
@ -141,7 +141,7 @@
<button
enabled="false"
follows="bottom|left"
height="25"
height="23"
label="Teleport"
layout="topleft"
left_pad="5"
@ -153,7 +153,7 @@
<button
enabled="false"
follows="bottom|left"
height="25"
height="23"
label="Map"
layout="topleft"
left_pad="5"

4
indra/newview/skins/default/xui/en/panel_place_profile.xml
View File

@ -517,7 +517,7 @@
width="60" />
<button
follows="bottom|right"
height="19"
height="23"
label="About Land"
layout="topleft"
name="about_land_btn"
@ -644,7 +644,7 @@
</text>
<button
follows="bottom|right"
height="19"
height="23"
label="Region/Estate"
layout="topleft"
name="region_info_btn"

15
indra/newview/skins/default/xui/en/panel_places.xml
View File

@ -72,7 +72,7 @@ background_visible="true"
width="313">
<button
follows="bottom|left"
height="19"
height="23"
label="Teleport"
layout="topleft"
left="5"
@ -82,17 +82,16 @@ background_visible="true"
width="100" />
<button
follows="bottom|left"
height="19"
height="23"
label="Map"
layout="topleft"
left_pad="5"
name="map_btn"
tool_tip="Show selected area on the map"
top="0"
width="70" />
<button
follows="bottom|left"
height="19"
height="23"
label="Edit"
layout="topleft"
left_pad="5"
@ -101,7 +100,7 @@ background_visible="true"
width="70" />
<button
follows="bottom|right"
height="19"
height="23"
image_disabled="ForwardArrow_Off"
image_selected="ForwardArrow_Press"
image_unselected="ForwardArrow_Off"
@ -112,7 +111,7 @@ background_visible="true"
width="18" />
<button
follows="bottom|right"
height="19"
height="23"
label="Close"
layout="topleft"
name="close_btn"
@ -121,7 +120,7 @@ background_visible="true"
width="60" />
<button
follows="bottom|right"
height="19"
height="23"
label="Cancel"
layout="topleft"
name="cancel_btn"
@ -130,7 +129,7 @@ background_visible="true"
width="60" />
<button
follows="bottom|right"
height="19"
height="23"
label="Save"
layout="topleft"
name="save_btn"

18
indra/newview/skins/default/xui/en/panel_profile.xml
View File

@ -275,12 +275,12 @@
left="0"
name="profile_buttons_panel"
top_pad="2"
bottom="10"
bottom="0"
height="19"
width="303">
<button
follows="bottom|left"
height="19"
height="23"
label="Add Friend"
layout="topleft"
left="0"
@ -291,7 +291,7 @@
width="77" />
<button
follows="bottom|left"
height="19"
height="23"
label="IM"
layout="topleft"
name="im"
@ -301,7 +301,7 @@
width="33" />
<button
follows="bottom|left"
height="19"
height="23"
label="Call"
layout="topleft"
name="call"
@ -312,7 +312,7 @@
<button
enabled="false"
follows="bottom|left"
height="19"
height="23"
label="Map"
layout="topleft"
name="show_on_map_btn"
@ -322,7 +322,7 @@
width="44" />
<button
follows="bottom|left"
height="19"
height="23"
label="Teleport"
layout="topleft"
name="teleport"
@ -332,7 +332,7 @@
width="67" />
<button
follows="bottom|right"
height="19"
height="23"
label="▼"
layout="topleft"
name="overflow_btn"
@ -352,14 +352,14 @@
width="303">
<button
follows="bottom|right"
height="19"
height="23"
left="10"
label="Edit Profile"
name="edit_profile_btn"
width="130" />
<button
follows="bottom|right"
height="19"
height="23"
label="Edit Appearance"
left_pad="10"
name="edit_appearance_btn"