merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3

JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed

1 files changed, 38 insertions, 5 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 311caa4866..c4c8aa24c4 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -16,7 +16,10 @@
      name="want_apply_text">
         Do you want to apply these changes?
     </panel.string>
-
+    <panel.string
+     name="group_join_btn">
+        Join (L$[AMOUNT])
+    </panel.string>
     <button
      layout="topleft"
      name="back"
@@ -39,6 +42,18 @@
      follows="top|left|right"
      mouse_opaque="true"
      name="group_name">(Loading...)</text>
+    <line_editor
+     follows="left|top"
+     font="SansSerif"
+     label="Type your new group name here"
+     layout="topleft"
+     left_delta="0"
+     max_length="35"
+     name="group_name_editor"
+     top_delta="5"
+     width="250"
+     height="20"
+     visible="true" />
     <texture_picker
      follows="left|top"
      height="113"
@@ -47,7 +62,7 @@
 	 left="10"
      name="insignia"
      tool_tip="Click to choose a picture"
-     top_pad="15"
+     top_pad="5"
      width="100" />
     <text
      type="string"
@@ -72,11 +87,21 @@
      use_ellipses="true"
      width="140" />
     <button
+     follows="left|top"
+     left_delta="0"
+     top_pad="10"
+     height="20"
+     label="Join"
+     label_selected="Join"
+     name="btn_join"
+     visible="true"
+     width="65" />
+    <button
      top="632"
      height="20"
      font="SansSerifSmall"
-     label="Apply"
-     label_selected="Apply"
+     label="Save"
+     label_selected="Save"
      name="btn_apply"
      left="5"
      width="65" />
@@ -93,13 +118,21 @@
     <button
      top="632"
      height="20"
-     font="SansSerifSmall"
      label="Create"
      label_selected="Create"
      name="btn_create"
      left="5"
      visible="false"
      width="65" />
+    <button
+	 top="632"
+	 left="75"	 
+     height="20"
+     label="Cancel"
+     label_selected="Cancel"
+     name="btn_cancel"
+     visible="false"
+     width="65" />
       <accordion layout="topleft" left="2" width="296" top="135" height="500" follows="all" name="group_accordion">
 		<accordion_tab min_height="445" title="Group General" name="group_general_tab">
         	<panel class="panel_group_general" filename="panel_group_general.xml" name="group_general_tab_panel"/>