Merge hg.aws.productengine.com/secondlife/viewer-2-0/ revs 3836-3849

5 files changed, 54 insertions, 3 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index d20566b08a..3f4f8b197f 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -86,6 +86,52 @@
              top="52"
              width="132" />
         </panel>
+        <panel
+         border="none"
+         height="150"
+         label="Friends"
+         layout="topleft"
+         left="6"
+         help_topic="avatarpicker_friends_tab"
+         name="FriendsPanel"
+         top="150"
+         width="132">
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="InstructSelectFriend"
+             top="15"
+             width="200">
+                Select a friend(s):
+            </text>
+            <button
+             follows="top|right"
+             layout="topleft"
+             right="-5"
+             top ="5"
+             height="20"
+             width="20"
+             name="RefreshFriends"
+             picture_style="true"
+             image_overlay="Refresh_Off">
+             <button.commit_callback 
+              function="Refresh.FriendList"/>
+            </button>
+            <scroll_list
+             follows="all"
+             height="100"
+             border="false"
+             layout="topleft"
+             left="0"
+             name="Friends"
+             sort_column="0"
+             top_pad="5"
+             width="132" />
+        </panel>
 
         <panel
          border="none"
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 78f53562cd..05b04bbf8e 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -5,10 +5,10 @@
   name="instant_message"
   width="300"
   height="180"
-  background_opaque="false"
-  background_visible="true"
+  background_opaque="true"
+  background_visible="false"
   follows="left|top|right|bottom"
-  bg_alpha_color="0.3 0.3 0.3 1.0">
+  bg_alpha_color="0.3 0.3 0.3 0">
 	<panel width="250" height="30" background_visible="true" background_opaque="false" bg_alpha_color="0.0 0.0 0.0 1.0" name="msg_caption">
   		<avatar_icon
       		top="25" left="10" width="20" height="20" follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index b002034a08..fedc49ae87 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -136,6 +136,7 @@
        layout="topleft"
        left="120"
        top="18"
+       max_length="512"
        name="sl_description_edit"
        width="173"
        word_wrap="true">
@@ -188,6 +189,7 @@
        height="100"
        layout="topleft"
        left="120"
+       max_length="512"
        top="142"
        name="fl_description_edit"
        width="173"
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
index af00b96d27..2182163da5 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml
@@ -23,6 +23,7 @@
      layout="topleft"
      left_delta="7"
      left="0"
+     max_length="254"
      name="chat_box"
      tool_tip="Press Enter to say, Ctrl+Enter to shout"
      top="0"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 73a759a8ba..5af7d7d674 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -81,6 +81,7 @@
              height="95"
              layout="topleft"
              left="107"
+             max_length="512"
              name="sl_description_edit"
              top_pad="-3"
              width="173"
@@ -123,6 +124,7 @@
              height="95"
              layout="topleft"
              left="107"
+             max_length="512"
              name="fl_description_edit"
              top_pad="-3"
              width="173"