From 032d19bdea92fbc4d584fb630a37ceccb07a5a40 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 24 May 2009 21:52:44 -0500
Subject: Moved LLAgent::teleportHome() definition.

Was in llagent.h for no good reason, now in llagent.cpp.
---
 linden/indra/newview/llagent.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'linden/indra/newview/llagent.cpp')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index d268397..7f6cd0c 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5926,6 +5926,13 @@ void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 	}
 }
 
+
+void LLAgent::teleportHome()
+{
+	teleportViaLandmark(LLUUID::null);
+}
+
+
 void LLAgent::setTeleportState(ETeleportState state)
 {
 	mTeleportState = state;
-- 
cgit v1.1


From f8b927f29f4adbee50ead87d26a9f0531231e540 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 24 May 2009 22:32:56 -0500
Subject: Added Teleport Home confirmation and callback methods.

  LLAgent::teleportHomeConfirm()
  LLAgent::teleportHomeCallback()
---
 linden/indra/newview/llagent.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'linden/indra/newview/llagent.cpp')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 7f6cd0c..46dc6f3 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5932,6 +5932,21 @@ void LLAgent::teleportHome()
 	teleportViaLandmark(LLUUID::null);
 }
 
+void LLAgent::teleportHomeConfirm()
+{
+	gViewerWindow->alertXml("ConfirmTeleportHome", LLAgent::teleportHomeCallback, (void *)this);
+}
+
+// static
+void LLAgent::teleportHomeCallback(S32 option, void *userdata)
+{
+	if( option == 0 )
+	{
+		// They confirmed it. Here we go!
+		((LLAgent *) userdata)->teleportHome();
+	}
+}
+
 
 void LLAgent::setTeleportState(ETeleportState state)
 {
-- 
cgit v1.1


From 2cc402c47a814d126f2643483e1812eb56d81f6f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 31 May 2009 22:16:58 -0500
Subject: Added a confirmation dialog for Take Off All Clothes.

---
 linden/indra/newview/llagent.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'linden/indra/newview/llagent.cpp')

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 46dc6f3..8c4e8b3 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7432,6 +7432,25 @@ void LLAgent::userRemoveWearable( void* userdata )
 	}
 }
 
+
+// static
+void LLAgent::userRemoveAllClothesConfirm()
+{
+	gViewerWindow->alertXml("ConfirmRemoveAllClothes",
+	                        LLAgent::userRemoveAllClothesCallback, NULL);
+}
+
+// static
+void LLAgent::userRemoveAllClothesCallback(S32 option, void *userdata)
+{
+	if( option == 0 )
+	{
+		// They confirmed it. Here we go!
+		LLAgent::userRemoveAllClothes(NULL);
+	}
+}
+
+
 void LLAgent::userRemoveAllClothes( void* userdata )
 {
 	// We have to do this up front to avoid having to deal with the case of multiple wearables being dirty.
-- 
cgit v1.1