aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-30 20:02:28 -0700
committerJacek Antonelli2010-05-04 03:00:01 -0500
commit3d69faca0f8edc55ba3308425a26dac6b70600f4 (patch)
tree09ea2bc91221111e33cbe7896f513844c24721e5
parentFixed search land sales, events, and classified panel layouts (diff)
downloadmeta-impy-3d69faca0f8edc55ba3308425a26dac6b70600f4.zip
meta-impy-3d69faca0f8edc55ba3308425a26dac6b70600f4.tar.gz
meta-impy-3d69faca0f8edc55ba3308425a26dac6b70600f4.tar.bz2
meta-impy-3d69faca0f8edc55ba3308425a26dac6b70600f4.tar.xz
Fixed en-us profile layout oddities for the avatar, interests, picks, and classifieds tabs and removed some references to 'Second Life'
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml26
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml2
2 files changed, 14 insertions, 14 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index dbaf48e..e945dbd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -92,7 +92,7 @@
92 <text bg_visible="false" border_drop_shadow_visible="false" 92 <text bg_visible="false" border_drop_shadow_visible="false"
93 border_visible="true" bottom_delta="0" drop_shadow_visible="true" 93 border_visible="true" bottom_delta="0" drop_shadow_visible="true"
94 follows="left|top" font="SansSerifSmall" height="48" left="264" 94 follows="left|top" font="SansSerifSmall" height="48" left="264"
95 mouse_opaque="false" name="acct" width="121" /> 95 mouse_opaque="false" name="acct" width="400" />
96 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 96 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
97 bottom_delta="-25" drop_shadow_visible="true" follows="left|top" 97 bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
98 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12" 98 font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
@@ -209,12 +209,12 @@
209 label="Interests" left="1" mouse_opaque="true" name="Interests" width="418"> 209 label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
210 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 210 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
211 bottom="-36" drop_shadow_visible="true" follows="left|top" 211 bottom="-36" drop_shadow_visible="true" follows="left|top"
212 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12" 212 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
213 mouse_opaque="true" name="I Want To:" v_pad="0" width="70"> 213 mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
214 I Want To: 214 I Want To:
215 </text> 215 </text>
216 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 216 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
217 initial_value="false" label="Build" left_delta="70" mouse_opaque="true" 217 initial_value="false" label="Build" left_delta="76" mouse_opaque="true"
218 name="chk0" width="90" /> 218 name="chk0" width="90" />
219 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 219 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
220 initial_value="false" label="Explore" left_delta="170" mouse_opaque="true" 220 initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
@@ -239,17 +239,17 @@
239 name="chk7" width="92" /> 239 name="chk7" width="92" />
240 <line_editor bevel_style="in" border_style="line" 240 <line_editor bevel_style="in" border_style="line"
241 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top" 241 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
242 font="SansSerifSmall" height="16" is_unicode="false" left="74" 242 font="SansSerifSmall" height="16" is_unicode="false" left="80"
243 max_length="254" mouse_opaque="true" name="want_to_edit" 243 max_length="254" mouse_opaque="true" name="want_to_edit"
244 width="330" /> 244 width="330" />
245 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 245 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
246 bottom_delta="-26" drop_shadow_visible="true" follows="left|top" 246 bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
247 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12" 247 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
248 mouse_opaque="true" name="Skills:" v_pad="0" width="70"> 248 mouse_opaque="true" name="Skills:" v_pad="0" width="70">
249 Skills: 249 Skills:
250 </text> 250 </text>
251 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 251 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
252 initial_value="false" label="Textures" left_delta="70" mouse_opaque="true" 252 initial_value="false" label="Textures" left_delta="76" mouse_opaque="true"
253 name="schk0" width="90" /> 253 name="schk0" width="90" />
254 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" 254 <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
255 initial_value="false" label="Architecture" left_delta="170" 255 initial_value="false" label="Architecture" left_delta="170"
@@ -268,18 +268,18 @@
268 mouse_opaque="true" name="schk5" width="127" /> 268 mouse_opaque="true" name="schk5" width="127" />
269 <line_editor bevel_style="in" border_style="line" 269 <line_editor bevel_style="in" border_style="line"
270 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top" 270 border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
271 font="SansSerifSmall" height="16" is_unicode="false" left="74" 271 font="SansSerifSmall" height="16" is_unicode="false" left="80"
272 max_length="254" mouse_opaque="true" name="skills_edit" 272 max_length="254" mouse_opaque="true" name="skills_edit"
273 width="330" /> 273 width="330" />
274 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 274 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
275 bottom_delta="-30" drop_shadow_visible="true" follows="left|top" 275 bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
276 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12" 276 font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
277 mouse_opaque="true" name="Languages:" v_pad="0" width="70"> 277 mouse_opaque="true" name="Languages:" v_pad="0" width="70">
278 Languages: 278 Languages:
279 </text> 279 </text>
280 <line_editor bevel_style="in" border_style="line" 280 <line_editor bevel_style="in" border_style="line"
281 border_thickness="1" bottom_delta="0" enabled="true" follows="left|top" 281 border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
282 font="SansSerifSmall" height="16" is_unicode="false" left="74" 282 font="SansSerifSmall" height="16" is_unicode="false" left="80"
283 max_length="254" mouse_opaque="true" name="languages_edit" 283 max_length="254" mouse_opaque="true" name="languages_edit"
284 width="330" /> 284 width="330" />
285 </panel> 285 </panel>
@@ -291,7 +291,7 @@
291 mouse_opaque="true" 291 mouse_opaque="true"
292 name="Tell everyone about your favorite places in Second Life." v_pad="0" 292 name="Tell everyone about your favorite places in Second Life." v_pad="0"
293 width="302"> 293 width="302">
294 Tell everyone about your favorite places in Second Life. 294 Tell everyone about your favorite places.
295 </text> 295 </text>
296 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 296 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
297 height="20" label="New..." label_selected="New..." left="114" 297 height="20" label="New..." label_selected="New..." left="114"
@@ -299,7 +299,7 @@
299 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20" 299 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
300 label="Delete..." label_selected="Delete..." left_delta="79" 300 label="Delete..." label_selected="Delete..." left_delta="79"
301 mouse_opaque="true" name="Delete..." width="75" /> 301 mouse_opaque="true" name="Delete..." width="75" />
302 <tab_container bottom="-411" follows="left|top" height="363" left="12" mouse_opaque="false" 302 <tab_container bottom="-411" follows="left|top" height="363" left="2" mouse_opaque="false"
303 name="picks tab" tab_position="left" width="412" /> 303 name="picks tab" tab_position="left" width="412" />
304 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 304 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
305 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif" 305 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
@@ -317,7 +317,7 @@
317 mouse_opaque="true" 317 mouse_opaque="true"
318 name="Place an ad in Second Life&apos;s classified listings." v_pad="0" 318 name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
319 width="302"> 319 width="302">
320 Place an ad in Second Life&apos;s classified listings. 320 Place an ad in the current grid&apos;s classified listings.
321 </text> 321 </text>
322 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center" 322 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
323 height="20" label="New..." label_selected="New..." left="114" 323 height="20" label="New..." label_selected="New..." left="114"
@@ -325,7 +325,7 @@
325 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20" 325 <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
326 label="Delete..." label_selected="Delete..." left_delta="79" 326 label="Delete..." label_selected="Delete..." left_delta="79"
327 mouse_opaque="true" name="Delete..." width="75" /> 327 mouse_opaque="true" name="Delete..." width="75" />
328 <tab_container bottom="-443" follows="left|top" height="395" left="12" mouse_opaque="false" 328 <tab_container bottom="-443" follows="left|top" height="395" left="2" mouse_opaque="false"
329 name="classified tab" tab_position="left" width="412" /> 329 name="classified tab" tab_position="left" width="412" />
330 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 330 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
331 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif" 331 bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
index 2c9ef99..5789474 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
@@ -17,7 +17,7 @@
17 <button bottom_delta="-27" follows="left|top" height="20" label="Set Location" 17 <button bottom_delta="-27" follows="left|top" height="20" label="Set Location"
18 left="10" name="set_location_btn" width="120" /> 18 left="10" name="set_location_btn" width="120" />
19 <button bottom_delta="0" follows="left|top" height="20" label="Teleport" 19 <button bottom_delta="0" follows="left|top" height="20" label="Teleport"
20 left_delta="120" name="classified_teleport_btn" width="90" /> 20 left_delta="110" name="classified_teleport_btn" width="90" />
21 <button bottom_delta="0" follows="left|top" height="20" label="Map" left_delta="90" 21 <button bottom_delta="0" follows="left|top" height="20" label="Map" left_delta="90"
22 name="classified_map_btn" width="80" /> 22 name="classified_map_btn" width="80" />
23 <combo_box bottom_delta="-27" follows="left|top" height="18" label="" left="10" 23 <combo_box bottom_delta="-27" follows="left|top" height="18" label="" left="10"