diff options
author | RevolutionSmythe | 2010-10-20 16:31:09 -0500 |
---|---|---|
committer | McCabe Maxsted | 2010-11-01 16:58:02 -0700 |
commit | af6877fbfe94e80948c559cf77f008049f8168dc (patch) | |
tree | 4fe687aaec6a1b964a0e989d3c03c143b4ab07f6 /linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | |
parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
download | meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.zip meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.gz meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.bz2 meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.xz |
Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml')
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 10 |
1 files changed, 5 insertions, 5 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 2360e6b..0df65e7 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 | |||
@@ -138,11 +138,11 @@ | |||
138 | bottom_delta="-6" drop_shadow_visible="true" follows="left|top" | 138 | bottom_delta="-6" drop_shadow_visible="true" follows="left|top" |
139 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0" | 139 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0" |
140 | mouse_opaque="true" name="About:" v_pad="0" width="170"> | 140 | mouse_opaque="true" name="About:" v_pad="0" width="170"> |
141 | About (500 chars): | 141 | About (8196 chars): |
142 | </text> | 142 | </text> |
143 | <text_editor bottom_delta="-137" embedded_items="false" | 143 | <text_editor bottom_delta="-137" embedded_items="false" |
144 | enabled="true" follows="left|top" font="SansSerifSmall" height="137" | 144 | enabled="true" follows="left|top" font="SansSerifSmall" height="137" |
145 | is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true" | 145 | is_unicode="false" left_delta="0" max_length="8196" mouse_opaque="true" |
146 | name="about" width="235" word_wrap="true" spell_check="true" /> | 146 | name="about" width="235" word_wrap="true" spell_check="true" /> |
147 | 147 | ||
148 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" | 148 | <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" |
@@ -350,11 +350,11 @@ | |||
350 | bottom_delta="-8" drop_shadow_visible="true" follows="left|top" | 350 | bottom_delta="-8" drop_shadow_visible="true" follows="left|top" |
351 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12" | 351 | font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12" |
352 | mouse_opaque="true" name="Info:" v_pad="0" width="161"> | 352 | mouse_opaque="true" name="Info:" v_pad="0" width="161"> |
353 | Info (250 chars): | 353 | Info (8196 chars): |
354 | </text> | 354 | </text> |
355 | <text_editor bottom_delta="-179" embedded_items="false" | 355 | <text_editor bottom_delta="-179" embedded_items="false" |
356 | enabled="true" follows="left|top" font="SansSerifSmall" height="178" | 356 | enabled="true" follows="left|top" font="SansSerifSmall" height="178" |
357 | is_unicode="false" left="12" max_length="254" mouse_opaque="false" | 357 | is_unicode="false" left="12" max_length="8196" mouse_opaque="false" |
358 | name="about" width="378" word_wrap="true" spell_check="true" /> | 358 | name="about" width="378" word_wrap="true" spell_check="true" /> |
359 | </panel> | 359 | </panel> |
360 | <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" | 360 | <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466" |
@@ -372,7 +372,7 @@ | |||
372 | </text> | 372 | </text> |
373 | <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top" | 373 | <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top" |
374 | font="SansSerif" height="256" is_unicode="false" left="10" | 374 | font="SansSerif" height="256" is_unicode="false" left="10" |
375 | max_length="1023" mouse_opaque="true" name="notes edit" width="400" | 375 | max_length="8196" mouse_opaque="true" name="notes edit" width="400" |
376 | word_wrap="false" spell_check="true" /> | 376 | word_wrap="false" spell_check="true" /> |
377 | </panel> | 377 | </panel> |
378 | </tab_container> | 378 | </tab_container> |