Second Life viewer sources 1.18.6.1-RC

2 files changed, 9 insertions, 7 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/menu_login.xml b/linden/indra/newview/skins/xui/en-us/menu_login.xml
index 6533f90..02addf3 100644
--- a/linden/indra/newview/skins/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_login.xml
@@ -5,7 +5,7 @@
      width="802">

         <menu bottom="273" drop_shadow="true" enabled="true" height="263"

              hidden="false" label="File" left="0" mouse_opaque="false" name="File"

-             opaque="true" tear_off="true" create_jump_keys="true" width="243">

+             opaque="true" tear_off="false" create_jump_keys="true" width="243">

                 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Quit" left="0"

                      mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">

                         <on_click function="File.Quit" userdata="" />

@@ -13,7 +13,7 @@
         </menu>

         <menu bottom="97" drop_shadow="true" enabled="true" height="439"

              hidden="false" label="Edit" left="38" mouse_opaque="false" name="Edit"

-             opaque="true" tear_off="true" create_jump_keys="true" width="153">

+             opaque="true" tear_off="false" create_jump_keys="true" width="153">

                 <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Preferences..."

                      left="0" mouse_opaque="true" name="Preferences..." shortcut="control|P"

                      width="153">

@@ -22,7 +22,7 @@
         </menu>

         <menu bottom="219" drop_shadow="true" enabled="true" height="317"

              hidden="false" label="Help" left="80" mouse_opaque="false" name="Help"

-             opaque="true" tear_off="true" create_jump_keys="true" width="166">

+             opaque="true" tear_off="falsoe" create_jump_keys="true" width="166">

              <menu_item_call bottom="-29" enabled="true" height="19" hidden="false" label="Second Life Help"

                      left="0" mouse_opaque="true" name="Second Life Help" shortcut="F1"

                      width="166">

diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index c5c42b4..a51b8e7 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -6,6 +6,7 @@
                         <text hidden="true" name="CaptionTextAcctInfo">
                                 [ACCTTYPE]
 [PAYMENTINFO]
+[AGEVERIFICATION]
                         </text>
                         <text hidden="true" name="AcctTypeResident">
                                 Resident
@@ -29,10 +30,10 @@
                                 No Payment Info On File
                         </text>
                         <text hidden="true" name="AgeVerified">
-                                , Age-verified
+                                Age-verified
                         </text>
                         <text hidden="true" name="NotAgeVerified">
-                                , Not Age-verified
+                                Not Age-verified
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
@@ -68,12 +69,13 @@
                              mouse_opaque="true" name="label2" v_pad="0" width="121">
                                 Account:
                         </text>
-                        <view_border bevel_style="in" bottom_delta="-32" follows="left|top" height="32" left="279"
+                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
                              mouse_opaque="false" name="acct_border" width="121" />
                         <text bg_color="0, 0, 0, 0" bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" height="32" left="279"
+                             follows="left|top" font="SansSerifSmall" height="48" left="279"
                              mouse_opaque="false" name="acct" text_color="1, 1, 1, 1" width="121" />
+
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"