Merged in jacek/next

1 files changed, 9 insertions, 3 deletions

diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 97f9aed..4d24aee 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -462,7 +462,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 +668,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