Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 4d24aee..7515781 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2000-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -139,7 +139,7 @@ public:
 
         // Called whenever the agent moves.  Puts camera back in default position,
         // deselects items, etc.
-        void                    resetView(BOOL reset_camera = TRUE);
+        void                    resetView(BOOL reset_camera = TRUE, BOOL change_camera = FALSE);
 
         // Called on camera movement, to allow the camera to be unlocked from the 
         // default position behind the avatar.
@@ -378,7 +378,7 @@ public:
         void                    sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request);
         void                    sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request);
 
-        LLVector3               calcFocusOffset(LLViewerObject *object, S32 x, S32 y);
+        LLVector3               calcFocusOffset(LLViewerObject *object, LLVector3 pos_agent, S32 x, S32 y);
         BOOL                    calcCameraMinDistance(F32 &obj_min_distance);
 
         void                    startCameraAnimation();