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

QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.

27 files changed, 561 insertions, 238 deletions

diff --git a/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png b/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
new file mode 100644
index 0000000000..be7c87efb6
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/avatar_free_mode.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
new file mode 100644
index 0000000000..9a3f3703b2
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_free_mode.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
new file mode 100644
index 0000000000..dd72cc0162
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_orbit_mode.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png b/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
new file mode 100644
index 0000000000..b537dcbe46
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_pan_mode.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
new file mode 100644
index 0000000000..7674a75ac3
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_preset_front_view.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
new file mode 100644
index 0000000000..9c9b923a5a
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_preset_group_view.png
diff --git a/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png b/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
new file mode 100644
index 0000000000..15c3053491
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/camera_preset_rear_view.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_first.png b/indra/newview/skins/default/textures/quick_tips/move_fly_first.png
new file mode 100644
index 0000000000..b6e2ce60e4
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_fly_first.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_fly_second.png b/indra/newview/skins/default/textures/quick_tips/move_fly_second.png
new file mode 100644
index 0000000000..84b63cc338
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_fly_second.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_first.png b/indra/newview/skins/default/textures/quick_tips/move_run_first.png
new file mode 100644
index 0000000000..16093dc683
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_run_first.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_run_second.png b/indra/newview/skins/default/textures/quick_tips/move_run_second.png
new file mode 100644
index 0000000000..19fa43ec32
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_run_second.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_first.png b/indra/newview/skins/default/textures/quick_tips/move_walk_first.png
new file mode 100644
index 0000000000..92d120d53e
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_walk_first.png
diff --git a/indra/newview/skins/default/textures/quick_tips/move_walk_second.png b/indra/newview/skins/default/textures/quick_tips/move_walk_second.png
new file mode 100644
index 0000000000..f8e28722be
--- /dev/null
+++ b/indra/newview/skins/default/textures/quick_tips/move_walk_second.png
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 343ff893e8..1501f39b67 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_minimize="false"
+ can_close="false" 
  center_horiz="true"
  follows="top"
- height="64"
+ height="95"
  layout="topleft"
  name="camera_floater"
  save_rect="true"
  save_visibility="true"
- width="176">
+ width="105">
     <floater.string
      name="rotate_tooltip">
         Rotate Camera Around Focus
@@ -21,50 +22,121 @@
      name="move_tooltip">
         Move Camera Up and Down, Left and Right
     </floater.string>
-    <joystick_rotate
-     follows="top|left"
+    <panel
+     border="true"
      height="64"
-     image_selected="cam_rotate_in.tga"
-     image_unselected="cam_rotate_out.tga"
      layout="topleft"
-     left="16"
-     name="cam_rotate_stick"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="rotate_tooltip"
+     left="0"
      top="0"
-     width="64" />
-    <joystick_zoom
-     follows="top|left"
-     height="64"
-     image_unselected="cam_zoom_out.tga"
-     layout="topleft"
-     left_delta="64"
-     minus_image="cam_zoom_minus_in.tga"
-     name="zoom"
-     picture_style="true"
-     plus_image="cam_zoom_plus_in.tga"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="zoom_tooltip"
-     top_delta="0"
-     width="16" />
-    <joystick_track
-     follows="top|left"
-     height="64"
-     image_selected="cam_tracking_in.tga"
-     image_unselected="cam_tracking_out.tga"
+     name="controls"
+     width="105">
+        <joystick_rotate
+         follows="top|left"
+         height="64"
+         image_selected="cam_rotate_in.tga"
+         image_unselected="cam_rotate_out.tga"
+         layout="topleft"
+         left="2"
+         name="cam_rotate_stick"
+         picture_style="true"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Orbit Camera Around Focus"
+         top="0"
+         width="64" />
+        <joystick_track
+         follows="top|left"
+         height="64"
+         image_selected="cam_tracking_in.tga"
+         image_unselected="cam_tracking_out.tga"
+         layout="topleft"
+         left="2"
+         name="cam_track_stick"
+         picture_style="true"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Move Camera Up and Down, Left and Right"
+         top="0"
+         visible="false"
+         width="64" />
+        <joystick_zoom
+         follows="top|left"
+         height="64"
+         image_unselected="cam_zoom_out.tga"
+         layout="topleft"
+         left_delta="74"
+         minus_image="cam_zoom_minus_in.tga"
+         name="zoom"
+         picture_style="true"
+         plus_image="cam_zoom_plus_in.tga"
+         quadrant="left"
+         scale_image="false"
+         sound_flags="3"
+         tool_tip="Zoom Camera Towards Focus"
+         top_delta="0"
+         width="16" />
+    </panel>
+    <panel
+     border="true"
+     height="30"
      layout="topleft"
-     left_delta="16"
-     name="cam_track_stick"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     sound_flags="3"
-     tool_tip="move_tooltip"
-     top_delta="0"
-     width="64" />
+     left="0"
+     top_pad="1"
+     name="buttons"
+     width="105">
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left="0"
+         is_toggle="true"
+         image_selected="btn_orbit_selected.png"
+         image_unselected="btn_orbit_unselected.png"
+         name="orbit_btn"
+         tab_stop="false"
+         tool_tip="Orbit Camera"
+         value="true"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_selected="btn_pan_selected.png"
+         image_unselected="btn_pan_unselected.png"
+         name="pan_btn"
+         tab_stop="false"
+         tool_tip="Pan Camera"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="1"
+         is_toggle="true"
+         image_selected="btn_freecamera_selected.png"
+         image_unselected="btn_freecamera_unselected.png"
+         name="freecamera_btn"
+         tab_stop="false"
+         tool_tip="View Object"
+         width="25">
+        </button>
+        <button
+         height="25"
+         label=""
+         layout="topleft"
+         left_pad="2"
+         image_selected="btn_firstperson_selected.png"
+         image_unselected="btn_firstperson_unselected.png"
+         name="avatarview_btn"
+         tab_stop="false"
+         tool_tip="See as Avatar"
+         width="25">
+        </button>
+    </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_first_time_tip.xml b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
new file mode 100644
index 0000000000..c16373ba3c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_first_time_tip.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_close="true"
+ can_minimize="false"
+ height="250"
+ layout="topleft"
+ name="set_name_in_the_cladd"
+ save_rect="true"
+ width="300">
+    <check_box
+     height="20"
+     follows="left|bottom|right"
+     label="Turn off Quick Tips"
+     layout="topleft"
+     left="5"
+     name="DontShowFirstTimeTip_checkbox"
+     text_enabled_color="white"
+     top="225"
+     width="200" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_moveview.xml b/indra/newview/skins/default/xui/en/floater_moveview.xml
index 7666a2494d..17d12c89b7 100644
--- a/indra/newview/skins/default/xui/en/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/en/floater_moveview.xml
@@ -1,128 +1,184 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
+ can_close="false"
  can_minimize="false"
  center_horiz="true"
  follows="bottom"
- height="58"
+ height="95"
  layout="topleft"
  name="move_floater"
  save_rect="true"
  save_visibility="true"
- width="135">
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_turn_left_out.tga"
-     image_disabled_selected="move_turn_left_in.tga"
-     image_selected="move_turn_left_in.tga"
-     image_unselected="move_turn_left_out.tga"
-     layout="topleft"
-     left="20"
-     name="turn left btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Turn Left"
-     top="29"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_turn_right_out.tga"
-     image_disabled_selected="move_turn_right_in.tga"
-     image_selected="move_turn_right_in.tga"
-     image_unselected="move_turn_right_out.tga"
-     layout="topleft"
-     left_pad="21"
-     name="turn right btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Turn Right"
-     top_delta="0"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_up_out.tga"
-     image_disabled_selected="move_up_in.tga"
-     image_selected="move_up_in.tga"
-     image_unselected="move_up_out.tga"
-     layout="topleft"
-     left="91"
-     name="move up btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Jump or Fly Up"
-     top="4"
-     width="25" />
-    <button
-     follows="left|bottom"
-     height="25"
-     image_disabled="move_down_out.tga"
-     image_disabled_selected="move_down_in.tga"
-     image_selected="move_down_in.tga"
-     image_unselected="move_down_out.tga"
-     layout="topleft"
-     left_delta="0"
-     name="move down btn"
-     picture_style="true"
-     scale_image="false"
-     tool_tip="Crouch or Fly Down"
-     top_delta="25"
-     width="25" />
-    <joystick_slide
-     follows="left|bottom"
-     height="25"
-     image_selected="move_left_in.tga"
-     image_unselected="move_left_out.tga"
-     layout="topleft"
-     left="20"
-     name="slide left btn"
-     picture_style="true"
-     quadrant="left"
-     scale_image="false"
-     tool_tip="Move Left"
-     top="4"
-     width="25" />
-    <joystick_slide
-     follows="left|bottom"
-     height="25"
-     image_selected="move_right_in.tga"
-     image_unselected="move_right_out.tga"
-     layout="topleft"
-     left_pad="21"
-     name="slide right btn"
-     picture_style="true"
-     quadrant="right"
-     scale_image="false"
-     tool_tip="Move Right"
-     top_delta="0"
-     width="25" />
-    <joystick_turn
-     follows="left|bottom"
-     height="25"
-     image_selected="move_forward_in.tga"
-     image_unselected="move_forward_out.tga"
+ width="115">
+    <string
+     name="walk_forward_tooltip">
+        Walk Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="walk_back_tooltip">
+        Walk Backwards (press Down Arrow or S)
+    </string>
+    <string
+     name="run_forward_tooltip">
+        Run Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="run_back_tooltip">
+        Run Backwards (press Down Arrow or S)
+    </string>
+    <string
+     name="fly_forward_tooltip">
+        Fly Forward (press Up Arrow or W)
+    </string>
+    <string
+     name="fly_back_tooltip">
+        Fly Backwards (press Down Arrow or S)
+    </string>
+    <panel
+     border="true" 
+     height="70"
+     follows="left|top" 
      layout="topleft"
-     left_delta="-21"
-     name="forward btn"
-     picture_style="true"
-     quadrant="up"
-     scale_image="false"
-     tool_tip="Move Forward"
-     top_delta="0"
-     width="21" />
-    <joystick_turn
-     follows="left|bottom"
+     left="0"
+     name="panel_actions"
+     top="0"
+     width="115">
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_turn_left_in.tga"
+         image_unselected="move_turn_left_out.tga"
+         layout="topleft"
+         left="10"
+         name="turn left btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Turn Left (press Left Arrow or A)"
+         top="35"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_turn_right_in.tga"
+         image_unselected="move_turn_right_out.tga"
+         layout="topleft"
+         left_pad="45"
+         name="turn right btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Turn Right (press Right Arrow or D)"
+         top_delta="0"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_up_in.tga"
+         image_unselected="move_up_out.tga"
+         layout="topleft"
+         left="10"
+         name="move up btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Fly Up, Press &quot;E&quot;"
+         top="4"
+         width="25" />
+        <button
+         follows="left|bottom"
+         height="25"
+         image_selected="move_down_in.tga"
+         image_unselected="move_down_out.tga"
+         layout="topleft"
+         left_pad="45"
+         name="move down btn"
+         picture_style="true"
+         scale_image="false"
+         tool_tip="Fly Down, Press &quot;C&quot;"
+         top_delta="0"
+         width="25" />
+        <joystick_turn
+         follows="left|bottom"
+         height="25"
+         image_selected="move_forward_in.tga"
+         image_unselected="move_forward_out.tga"
+         layout="topleft"
+         left="47"
+         name="forward btn"
+         picture_style="true"
+         quadrant="up"
+         scale_image="false"
+         tool_tip="Walk Forward (press Up Arrow or W)"
+         top_delta="10"
+         width="21" />
+        <joystick_turn
+         follows="left|bottom"
+         height="25"
+         image_selected="move_backward_in.tga"
+         image_unselected="move_backward_out.tga"
+         layout="topleft"
+         left_delta="0"
+         name="backward btn"
+         picture_style="true"
+         quadrant="down"
+         scale_image="false"
+         tool_tip="Walk Backward (press Down Arrow or S)"
+         top_delta="30"
+         width="21" />
+    </panel>
+<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
+    <panel
+     border="true" 
      height="25"
-     image_selected="move_backward_in.tga"
-     image_unselected="move_backward_out.tga"
      layout="topleft"
-     left_delta="0"
-     name="backward btn"
-     picture_style="true"
-     quadrant="down"
-     scale_image="false"
-     tool_tip="Move Backward"
-     top_delta="25"
-     width="21" />
+     left="0"
+     name="panel_modes"
+     top_pad="1"
+     width="115">
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Walk"
+         layout="topleft"
+         name="mode_walk_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Walking Mode"
+         top="2"
+         width="43" />
+        <button
+         follows="left|bottom"
+         font="SansSerifSmall" 
+         height="20"
+         label="Run"
+         layout="topleft"
+         left_pad="0"
+         name="mode_run_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Running Mode"
+         top="2"
+         width="37" />
+        <button
+         follows="left|bottom"
+         height="20"
+         label="Fly"
+         layout="topleft"
+         left_pad="0"
+         name="mode_fly_btn"
+         pad_left="0"
+         pad_right="0"
+         tool_tip="Flying Mode"
+         top="2"
+         width="35" />
+        <button
+         visible="false" 
+         follows="left|bottom"
+         height="20"
+         label="Stop Flying"
+         layout="topleft"
+         left="0"
+         name="stop_fly_btn"
+         tool_tip="Stop Flying"
+         top="2"
+         width="115" />
+    </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/menu_navbar.xml b/indra/newview/skins/default/xui/en/menu_navbar.xml
index 013136a593..435d928f00 100644
--- a/indra/newview/skins/default/xui/en/menu_navbar.xml
+++ b/indra/newview/skins/default/xui/en/menu_navbar.xml
@@ -8,14 +8,17 @@
  top="624"
  visible="false"
  width="128">
-    <menu_item_call
-     label="Copy SLurl to Clipboard"
-     layout="topleft"
-     name="Copy SLURL">
-        <menu_item_call.on_click
-         function="Navbar.Action"
-         parameter="copy_url" />
-    </menu_item_call>
+    <menu_item_check
+         label="Show Coordinates"
+         layout="topleft"
+         name="Show Coordinates">
+           <menu_item_check.on_click
+             function="Navbar.Action"
+             parameter="show_coordinates" />
+             <menu_item_check.on_check
+             function="Navbar.EnableMenuItem"
+             parameter="show_coordinates" />
+    </menu_item_check>
     <menu_item_call
      label="Add Landmark..."
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fe1baf22d0..4d1572e4a5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -405,6 +405,15 @@
              function="Floater.Show"
              parameter="hud" />
         </menu_item_call>
+        <menu_item_check
+         label="Show Quick Tips"
+         layout="topleft"
+         name="Show Quick Tips">
+            <menu_item_check.on_check
+             function="Help.CheckShowFirstTimeTip" />
+            <menu_item_check.on_click
+             function="Help.ShowQuickTips" />
+        </menu_item_check>
         <menu_item_separator
              layout="topleft" />
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index d42943d225..4c880f6dc0 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -55,8 +55,8 @@
          left="0"
          name="DUMMY"
          top="0"
-         width="5" 
-         min_width="5"/>
+         width="3" 
+         min_width="3"/>
         <layout_panel
          auto_resize="false"
          follows="right"
@@ -64,19 +64,116 @@
          layout="topleft"
 		 left="5"
          min_height="28"
-         width="90"
+         width="70"
          top_delta="-10"
-         min_width="90"
+         min_width="70"
          user_resize="false">
             <button
-             bottom="22"
              follows="right"
              height="20"
-             label="Stand Up"
+             is_toggle="true"
+             label="Move"
+             layout="topleft"
+             name="movement_btn"
+             tab_stop="false"
+             tool_tip="Shows/Hide Movement controls" 
+             top="6"
+             width="70">
+                <button.init_callback
+                 function="Button.SetFloaterToggle"
+                 parameter="moveview" />
+            </button>
+        </layout_panel>
+         <icon
+         auto_resize="false"
+         color="0 0 0 0"
+         follows="left|right"
+         height="10"
+         image_name="spacer24.tga"
+         layout="topleft"
+         left="0"
+         name="DUMMY"
+         top="0"
+         width="8" 
+         min_width="8"/>
+        <layout_panel
+         auto_resize="false"
+         follows="right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="150"
+         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"
+                 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="3/4_view"
+                 tool_tip="3/4 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"
              layout="topleft"
-             name="stand"
-             top="3"
-             width="90" />
+             left_pad="0"
+             tab_stop="false"
+             tool_tip="Shows/Hide Camera controls" 
+             top="6"
+             name="camera_btn"
+             width="70">
+                <button.init_callback
+                 function="Button.SetFloaterToggle"
+                 parameter="camera" />
+            </button>
+            <split_button
+             arrow_position="right"
+             follows="right"
+             height="18"
+             left_pad="0"
+             name="snapshots"
+             top="6"
+             width="35">
+                <split_button.arrow_button 
+                 image_selected="camera_presets/camera_presets_arrow_right.png"
+                 image_unselected="camera_presets/camera_presets_arrow_right.png"
+                 image_disabled_selected="camera_presets/camera_presets_arrow_right.png" 
+                 image_disabled="camera_presets/camera_presets_arrow_right.png"
+                 tool_tip="Snapshot Settings" />
+                 />
+                <split_button.item
+                 image_selected="camera_presets/camera_presets_snapshot.png"
+                 image_unselected="camera_presets/camera_presets_snapshot.png"
+                 name="snapshot"
+                 tool_tip="Take Snapshot" />
+            </split_button>
         </layout_panel>
         <icon
          auto_resize="false"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index f7b2481f1c..55ac14ed46 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -492,16 +492,4 @@
   <string name="no_groups">
     No groups
   </string>
-  <panel 
-	layout="topleft"
-	name="panel_profile_view" 
-	class="panel_profile_view" 
-	filename="panel_profile_view.xml"
-	top="0"
-	left="0"
-	width="355"
-	height="465"
-	follows="left|right|top|bottom"
-	visible="false"
-	/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index c91cb2394c..1a88cc55ec 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -1,52 +1,48 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
  background_visible="true"
- follows="left|top|right|bottom"
+ follows="all"
  height="400"
  label="Places"
  layout="topleft"
- left="0"
  min_height="350"
  min_width="240"
  name="places panel"
- top="400"
  width="305">
-    <panel.string
-     name="landmarks_tab_title">
-        Landmarks
-    </panel.string>
-    <panel.string
-     name="teleport_history_tab_title">
-        Teleport History
-    </panel.string>
+    <string
+     name="landmarks_tab_title"
+     value="Landmarks" />
+    <string
+     name="teleport_history_tab_title"
+     value="Teleport History" />
     <filter_editor
+     background_image="TextField_Search_Off"
      follows="left|top|right"
+     font="SansSerif"
      height="20"
      label="Filter"
      layout="topleft"
      left="15"
      name="Filter"
-     top="3"
-     width="270"
-     font="SansSerif"
-     background_image="TextField_Search_Off"
+     text_color="black"
      text_pad_left="23"
-     text_color="black"/>
+     top="3"
+     width="270" />
     <button
-      name="landmark_search"
-      layout="topleft"
-      top="5"
-      left="23"
-      width="13"
-      height="13"
-      scale_image="false"
-      follows="left|top|right"
-      font="SansSerifBigBold"
-      image_selected="Search"
-      image_unselected="Search"
-      picture_style="true"/>
+     follows="left|top|right"
+     font="SansSerifBigBold"
+     height="13"
+     image_selected="Search"
+     image_unselected="Search"
+     layout="topleft"
+     left="23"
+     name="landmark_search"
+     picture_style="true"
+     scale_image="false"
+     top="5"
+     width="13" />
     <tab_container
-     follows="left|top|right|bottom"
+     follows="all"
      height="326"
      layout="topleft"
      left="10"
@@ -54,26 +50,42 @@
      tab_position="top"
      top_pad="19"
      width="280" />
-    <panel
-     class="panel_place_info"
-     filename="panel_place_info.xml"
-     follows="left|top|right|bottom"
-     height="675"
+    <button
+     follows="bottom|left"
+     font="SansSerifSmallBold"
+     height="25"
+     image_disabled="widgets/SegmentedBtn_Left_Disabled.png"
+     image_selected="widgets/SegmentedBtn_Left_Selected.png"
+     image_unselected="widgets/SegmentedBtn_Left_Off.png"
+     label="Create"
      layout="topleft"
-     left="0"
-     name="panel_place_info"
-     top="-310"
+     left="10"
+     name="create_landmark_btn"
+     top_pad="5"
      visible="false"
-     width="280" />
+     width="60" />
+    <button
+     follows="bottom|left"
+     font="SansSerifSmallBold"
+     height="25"
+     image_disabled="widgets/ComboButton_Disabled.png"
+     image_selected="widgets/ComboButton_Selected.png"
+     image_unselected="widgets/ComboButton_Off.png"
+     label="▼"
+     layout="topleft"
+     left_pad="0"
+     name="folder_menu_btn"
+     visible="false"
+     width="20" />
     <button
      follows="bottom|left"
      font="SansSerifSmallBold"
      height="25"
      label="Teleport"
      layout="topleft"
-     left_delta="10"
+     left="10"
      name="teleport_btn"
-     top_pad="5"
+     top_delta="0"
      width="80" />
     <button
      follows="bottom|left"
@@ -97,7 +109,6 @@
      top_delta="0"
      width="60" />
     <button
-     enabled="true"
      follows="bottom|right"
      font="SansSerifSmallBold"
      height="25"
@@ -107,4 +118,13 @@
      name="overflow_btn"
      top_delta="0"
      width="30" />
+    <panel
+     class="panel_place_info"
+     filename="panel_place_info.xml"
+     follows="all"
+     layout="topleft"
+     left="0"
+     name="panel_place_info"
+     top="-200"
+     visible="false" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 4f559394a6..2b21c05283 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -438,7 +438,7 @@
              left="0"
              name="status_me_panel"
              top_pad="20"
-             width="125">
+             width="250">
                 <text
                  type="string"
                  follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index cd46ccb0bc..2466480d16 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -3,12 +3,12 @@
  background_visible="true"
  follows="left|top|right|bottom"
  height="660"
- label="Me"
+ label="Profile"
  layout="topleft"
  left="0"
  name="panel_target_profile"
  top="0"
- width="305">
+ width="250">
     <button 
      layout="topleft" 
      name="back" 
@@ -17,6 +17,7 @@
      width="20" 
      height="20" 
      label=""
+     tab_stop="false"
      follows="top|left"
      image_selected="navbar_bg_button.tga"
      image_unselected="navbar_bg_button.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index 096b60adb1..73b06a3e41 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -20,8 +20,6 @@
       <panel 
         name="panel_home" 
         filename="panel_sidetray_home_tab.xml" 
-        width="355" 
-        height="465" 
         label="home" 
         border="true" 
       />
@@ -37,15 +35,22 @@
     background_visible="true" 
     bg_opaque_color="0.5 0.5 0.5 1.0"
   >
+    <panel_container
+      name="panel_container"
+    >
       <panel 
         class="panel_people" 
         name="panel_people" 
         filename="panel_people.xml" 
-        width="280" 
-        height="465" 
-        label="People" 
         border="true" 
       />
+      <panel 
+        class="panel_profile_view" 
+        name="panel_profile_view" 
+        filename="panel_profile_view.xml"
+        border="true"
+      />
+    </panel_container>
   </sidetray_tab>
   <!-- *TODO Vadim: isn't the sidetray_tab "label" attribute redundant since we have "tab_title" ? -->
   <sidetray_tab 
diff --git a/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
new file mode 100644
index 0000000000..445c9cc288
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml-->
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_stand_stop_flying"
+ mouse_opaque="false" 
+ visible="false" 
+ width="115">
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Stand"
+     layout="topleft"
+     name="stand_btn"
+     tool_tip="Click here to stand up."
+     top="2"
+     width="115" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Stop Flying"
+     layout="topleft"
+     name="stop_fly_btn"
+     tool_tip="Stop Flying"
+     top="2"
+     width="115" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e5665b0194..c64316e305 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -335,7 +335,7 @@
 	<string name="GraphicsQualityHigh">High</string>
 	
 	<!-- mouselook -->
-	<string name="LeaveMouselook">Press ESC to leave Mouselook.</string>
+	<string name="LeaveMouselook">Press ESC to return to World View</string>
 	
 	<!-- inventory -->
 	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
diff --git a/indra/newview/skins/default/xui/en/widgets/split_button.xml b/indra/newview/skins/default/xui/en/widgets/split_button.xml
new file mode 100644
index 0000000000..b0367b599b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/split_button.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

+<split_button 

+ font="SansSerifSmall"

+ arrow_position="left"

+ follows="right|top">

+    <split_button.arrow_button 

+     name="Arrow Button"

+     label=""

+     font="SansSerifSmall"

+     scale_image="true"

+     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"

+     width="10"/>

+    <split_button.items_panel

+     background_visible="true"

+     border="true"

+     bg_alpha_color="1 1 1 1"

+     bg_opaq_color="1 1 1 1"

+     layout="topleft"

+     name="item_buttons"

+    />

+</split_button>