1 files changed, 13 insertions, 6 deletions

diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 97f9aed..a4a930f 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.
@@ -372,13 +372,14 @@ public:
         BOOL canFly();
 
         // Animation functions
+        void                    stopCurrentAnimations();
         void                    requestStopMotion( LLMotion* motion );
         void                    onAnimStop(const LLUUID& id);
 
         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();
@@ -462,7 +463,9 @@ public:
         void teleportViaLandmark(const LLUUID& landmark_id);
 
         // go home
-        void teleportHome()     { teleportViaLandmark(LLUUID::null); }
+        void teleportHome();
+        void teleportHomeConfirm();
+        static void teleportHomeCallback(S32 option, void *userdata);
 
         // to an invited location
         void teleportViaLure(const LLUUID& lure_id, BOOL godlike);
@@ -666,8 +669,12 @@ public:
         static void             stopFidget();
         static void             processAgentInitialWearablesUpdate(LLMessageSystem* mesgsys, void** user_data);
         static void             userRemoveWearable( void* userdata );   // userdata is EWearableType
-        static void             userRemoveAllClothes( void* userdata ); // userdata is NULL
-        static void             userRemoveAllClothesStep2(BOOL proceed, void* userdata ); // userdata is NULL
+
+  static void   userRemoveAllClothesConfirm();
+        static void   userRemoveAllClothesCallback(S32 option, void *userdata);
+        static void   userRemoveAllClothes( void* userdata );   // userdata is NULL
+        static void   userRemoveAllClothesStep2(BOOL proceed, void* userdata ); // userdata is NULL
+
         static void             userRemoveAllAttachments( void* userdata);      // userdata is NULL
         static BOOL             selfHasWearable( void* userdata );                      // userdata is EWearableType