From 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Sun, 21 Jun 2009 08:04:56 +0000
Subject: merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
 ignore-dead-branch

---
 .../skins/default/xui/en/floater_camera.xml        | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_camera.xml

(limited to 'indra/newview/skins/default/xui/en/floater_camera.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
new file mode 100644
index 0000000000..7f24b11d14
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_minimize="false"
+ center_horiz="true"
+ follows="top"
+ height="64"
+ layout="topleft"
+ name="camera_floater"
+ save_rect="true"
+ width="176">
+    <floater.string
+     name="rotate_tooltip">
+        Rotate Camera Around Focus
+    </floater.string>
+    <floater.string
+     name="zoom_tooltip">
+        Zoom Camera Towards Focus
+    </floater.string>
+    <floater.string
+     name="move_tooltip">
+        Move Camera Up and Down, Left and Right
+    </floater.string>
+    <joystick_rotate
+     follows="top|left"
+     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"
+     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"
+     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" />
+</floater>
-- 
cgit v1.2.3


From e4dc104e3296319476bb0d6c327d6a326c967976 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 10 Jul 2009 21:18:42 +0000
Subject: EXT-70 Camera and Movement controls don't save their positions
 DEV-35250 Quitting from the login screen forgets window placement and
 visibility (e.g. movement and camera floaters) reviewed by Leyla

---
 indra/newview/skins/default/xui/en/floater_camera.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_camera.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 7f24b11d14..343ff893e8 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -7,6 +7,7 @@
  layout="topleft"
  name="camera_floater"
  save_rect="true"
+ save_visibility="true"
  width="176">
     <floater.string
      name="rotate_tooltip">
-- 
cgit v1.2.3


From db5cda26676f376f18816013c0c5e3fbad5b20d0 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 3 Aug 2009 22:25:48 +0000
Subject: 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.

---
 .../skins/default/xui/en/floater_camera.xml        | 160 +++++++++++++++------
 1 file changed, 116 insertions(+), 44 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_camera.xml')

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>
-- 
cgit v1.2.3