merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3

* EXT-449 EXT-131 EXT-464
* People and Places panel layout changes
* Some I18N fixes, test language
* Updated group panels following proposed new design
* made ims easier to read by color coding

1 files changed, 77 insertions, 83 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index e616389c36..016aa64927 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -2,100 +2,95 @@
 <panel
  bevel_style="in"
  follows="left|top|right|bottom"
- height="570"
- width="295"
- border="false"
+ height="420"
+ label="Notes &amp; Privacy"
  layout="topleft"
  left="0"
+ name="panel_notes"
  top="0"
- label="Notes &amp; Privacy"
- name="panel_notes">
+ width="285">
     <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="570"
-     width="265"
+     height="350"
      layout="topleft"
-     left="5"
-     top_pad="0"
- bevel_style="in"
-     opaque="true"
+     left="2"
      name="profile_scroll"
-     reserve_scroll_corner="false">
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifBold"
-             height="16"
-             width="225"
-             left="0"
-             name="status_message"
-             text_color="white"
-             top="">
-               My private notes:
-            </text>
-            <text_editor
-             height="200"
-             follows="left|top"
-             width="243"
-             hide_scrollbar="true"
-             left="10"
-             max_length="1000"
-             name="notes_edit"
-             text_color="black"
-             top_pad="10"
-             word_wrap="true" />
-           <text
-             type="string"
-             length="1"
-             follows="left|top"
-             font="SansSerifBold"
-             height="16"
-             width="225"
-             left="10"
-             name="status_message2"
-             text_color="white"
-             top_pad="30">
-                Let this person:
-            </text>
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="See my online status"
-             left="20"
-             top_pad="10"
-             name="status_check" />
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="See me on the map"
-             left="20"
-             top_pad="10"
-             name="map_check"/>
-            <check_box
-             enabled="false"
-             follows="left|top"
-             width="230"
-             height="20"
-             label="Edit, delete or take my objects"
-             left="20"
-             top_pad="10"
-             name="objects_check" />
+     opaque="true"
+     top="0"
+     width="284">
+        <text
+         follows="left|top"
+         font="SansSerifBold"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="status_message"
+         text_color="white"
+         top="0"
+         value="My private notes:"
+         width="230" />
+        <text_editor
+         follows="left|top"
+         height="200"
+         hide_scrollbar="true"
+         layout="topleft"
+         left="10"
+         max_length="1000"
+         name="notes_edit"
+         text_color="black"
+         top_pad="10"
+         width="255"
+         word_wrap="true" />
+        <text
+         follows="left|top"
+         font="SansSerifBold"
+         height="16"
+         layout="topleft"
+         left="10"
+         name="status_message2"
+         text_color="white"
+         top_pad="10"
+         value="Let this person:"
+         width="225" />
+        <check_box
+         enabled="false"
+         height="20"
+         label="See my online status"
+         layout="topleft"
+         left="20"
+         name="status_check"
+         top_pad="0"
+         width="230" />
+        <check_box
+         enabled="false"
+         height="20"
+         label="See me on the map"
+         layout="topleft"
+         left="20"
+         name="map_check"
+         top_pad="0"
+         width="230" />
+        <check_box
+         enabled="false"
+         height="20"
+         label="Edit, delete or take my objects"
+         layout="topleft"
+         left="20"
+         name="objects_check"
+         top_pad="0"
+         width="230" />
     </scroll_container>
     <panel
      follows="bottom|left"
      height="30"
-     width="280"
      layout="topleft"
      left="10"
+     name="notes_buttons_panel"
      top_pad="5"
-     name="notes_buttons_panel">
+     width="280">
         <button
+         enabled="false"
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
@@ -103,19 +98,18 @@
          layout="topleft"
          left="0"
          name="teleport_btn"
-         enabled="false"
          top="0"
          width="75" />
         <button
+         enabled="false"
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
-         label="Show on Map"
+         label="Map"
          layout="topleft"
-         left_pad="0"
          name="show_on_map_btn"
-         enabled="false"
          top="0"
-         width="105" />
+         left_pad="5"
+         width="85" />
     </panel>
 </panel>