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, 23 insertions, 39 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 6449059ef0..90b331a39f 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- mouse_opaque="false"
+ mouse_opaque="true"
  background_visible="true"
  bg_alpha_color="0.25 0.25 0.25 1"
  bg_opaque_color="0.25 0.25 0.25 1"
@@ -36,13 +36,13 @@
          width="5"/>
         <layout_panel
  		 mouse_opaque="false"        
-         auto_resize="false"
+         auto_resize="true"
          follows="left|right"
          height="28"
          layout="topleft"
          left="5"
          min_height="28"
-         width="600"
+         width="450"
          top="0"
          min_width="305"
          name="chat_bar"
@@ -110,46 +110,13 @@
          name="cam_panel"
          top_delta="-10"
          width="150">
-            <split_button
-             follows="right"
-             height="18"
-             name="presets"
-             top="6"
-             width="35">
-                <split_button.arrow_button 
-                 image_selected="camera_presets/camera_presets_arrow.png"
-                 image_unselected="camera_presets/camera_presets_arrow.png"
-                 image_disabled_selected="camera_presets/camera_presets_arrow.png" 
-                 image_disabled="camera_presets/camera_presets_arrow.png"
-                 name="camera_presets"
-                 tool_tip="Camera Presets" 
-                 />
-                <split_button.item
-                 image_selected="camera_presets/camera_presets_rear_view.png"
-                 image_unselected="camera_presets/camera_presets_rear_view.png"
-                 name="rear_view"
-                 tool_tip="Rear View"
-                 />
-                <split_button.item
-                 image_selected="camera_presets/camera_presets_34_view.png"
-                 image_unselected="camera_presets/camera_presets_34_view.png"
-                 name="group_view"
-                 tool_tip="Group View" 
-                />
-                <split_button.item
-                 image_selected="camera_presets/camera_presets_fron_view.png"
-                 image_unselected="camera_presets/camera_presets_fron_view.png"
-                 name="front_view"
-                 tool_tip="Front View" 
-                />
-            </split_button>
             <button
              follows="right"
              height="20"
              is_toggle="true"
-             label="Camera"
+             label="View"
              layout="topleft"
-             left_pad="0"
+             left="0"
              tab_stop="false"
              tool_tip="Shows/Hide Camera controls" 
              top="6"
@@ -159,11 +126,28 @@
                  function="Button.SetFloaterToggle"
                  parameter="camera" />
             </button>
+ 			<button
+             follows="right"
+             name="camera_presets_btn"
+             top="6"
+             height="20"
+             width="20"
+             left_pad="0"
+             tab_stop="false"
+             is_toggle="true"
+             picture_style="true"
+         	 image_selected="toggle_button_selected"
+             image_unselected="toggle_button_off">
+             <button.init_callback
+             	function="Button.SetFloaterToggle"
+             	parameter="camera_presets"
+             	/>
+            </button>
             <split_button
              arrow_position="right"
              follows="right"
              height="18"
-             left_pad="0"
+             left_pad="4"
              name="snapshots"
              top="6"
              width="35">