From 2099a7a2287be16d861962fb19bf48a38f8d923c Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 25 May 2009 18:21:46 -0500
Subject: User-initiated Teleport Home has confirmation dialog.

That's in the World menu and on the world map.
---
 ChangeLog.txt                              | 9 +++++++++
 linden/indra/newview/llfloaterworldmap.cpp | 3 +--
 linden/indra/newview/llviewermenu.cpp      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d7048ad..cb5b323 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+2009-05-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/llfloaterworldmap.cpp:
+	User-initiated Teleport Home has confirmation dialog.
+	That's in the World menu and on the world map.
+	* linden/indra/newview/llviewermenu.cpp:
+	Ditto.
+
+
 2009-05-24  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/llagent.cpp:
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 8396454..66b2813 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -1052,8 +1052,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
 // static
 void LLFloaterWorldMap::onGoHome(void*)
 {
-	gAgent.teleportHome();
-	gFloaterWorldMap->close();
+	gAgent.teleportHomeConfirm();
 }
 
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 486e4f1..37f9ad2 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4686,7 +4686,7 @@ class LLWorldTeleportHome : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		gAgent.teleportHome();
+		gAgent.teleportHomeConfirm();
 		return true;
 	}
 };
-- 
cgit v1.1