diff options
author | Jacek Antonelli | 2010-02-27 13:56:38 -0600 |
---|---|---|
committer | Jacek Antonelli | 2010-02-27 14:06:27 -0600 |
commit | b70f06e2d825a25aca238c3aa71b894c3d18aef4 (patch) | |
tree | 37a11b3e3315c6d7022a9dc60643abbaf5551402 | |
parent | Some changes to help linux64. (diff) | |
download | meta-impy-b70f06e2d825a25aca238c3aa71b894c3d18aef4.zip meta-impy-b70f06e2d825a25aca238c3aa71b894c3d18aef4.tar.gz meta-impy-b70f06e2d825a25aca238c3aa71b894c3d18aef4.tar.bz2 meta-impy-b70f06e2d825a25aca238c3aa71b894c3d18aef4.tar.xz |
Fixed Import/Export/Make Outfit button positions (#215).
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_customize.xml | 33 |
2 files changed, 28 insertions, 12 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index de0266f..231aff9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2010-02-27 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * Fixed Import/Export/Make Outfit button positions (#215). | ||
4 | |||
5 | modified: linden/indra/newview/skins/default/xui/en-us/floater_customize.xml | ||
6 | |||
7 | |||
1 | 2010-02-27 Armin Weatherwax <Armin.Weatherwax@gmail.com> | 8 | 2010-02-27 Armin Weatherwax <Armin.Weatherwax@gmail.com> |
2 | 9 | ||
3 | * Some changes to help linux64. | 10 | * Some changes to help linux64. |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml index a8f699a..b4710be 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml | |||
@@ -1111,16 +1111,6 @@ scratch and wear it. | |||
1111 | </tab_container> | 1111 | </tab_container> |
1112 | <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197" | 1112 | <scroll_container bottom="-476" follows="left|top|right|bottom" height="382" left="197" |
1113 | mouse_opaque="false" name="panel_container" opaque="false" width="292" /> | 1113 | mouse_opaque="false" name="panel_container" opaque="false" width="292" /> |
1114 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" | ||
1115 | height="20" label="Cancel" label_selected="Cancel" mouse_opaque="true" | ||
1116 | name="Cancel" right="-10" scale_image="true" width="100" /> | ||
1117 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" | ||
1118 | height="20" label="OK" label_selected="OK" mouse_opaque="true" | ||
1119 | name="Ok" right="-116" scale_image="true" width="100" /> | ||
1120 | <button bottom="-536" follows="left|bottom" font="SansSerif" halign="center" | ||
1121 | height="20" label="Make Outfit..." label_selected="Make Outfit..." | ||
1122 | mouse_opaque="true" name="Make Outfit" left="100" scale_image="true" | ||
1123 | width="100" /> | ||
1124 | 1114 | ||
1125 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 1115 | <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
1126 | bottom="-400" drop_shadow_visible="true" follows="left|top" | 1116 | bottom="-400" drop_shadow_visible="true" follows="left|top" |
@@ -1141,7 +1131,26 @@ scratch and wear it. | |||
1141 | Avatar Height2 | 1131 | Avatar Height2 |
1142 | </text> | 1132 | </text> |
1143 | 1133 | ||
1144 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Export" label_selected="Export" right="-280" mouse_opaque="true" name="Export" scale_image="true" width="80" /> | 1134 | |
1145 | <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Import" label_selected="Import" right="-370" mouse_opaque="true" name="Import" scale_image="true" width="80" /> | 1135 | <button name="Import" label="Import" |
1136 | bottom="-536" left="10" height="20" width="70" | ||
1137 | follows="right|bottom" font="SansSerif" halign="center" /> | ||
1138 | |||
1139 | <button name="Export" label="Export" | ||
1140 | bottom_delta="0" left_delta="75" height="20" width="70" | ||
1141 | follows="right|bottom" font="SansSerif" halign="center" /> | ||
1142 | |||
1143 | <button name="Make Outfit" label="Make Outfit" | ||
1144 | bottom_delta="0" left_delta="100" height="20" width="100" | ||
1145 | follows="right|bottom" font="SansSerif" halign="center" /> | ||
1146 | |||
1147 | |||
1148 | <button name="Cancel" label="Cancel" | ||
1149 | bottom="-536" right="-10" height="20" width="80" | ||
1150 | follows="right|bottom" font="SansSerif" halign="center" /> | ||
1151 | |||
1152 | <button name="Ok" label="OK" | ||
1153 | bottom_delta="0" right="-95" height="20" width="80" | ||
1154 | follows="right|bottom" font="SansSerif" halign="center" /> | ||
1146 | 1155 | ||
1147 | </floater> | 1156 | </floater> |