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. --- ChangeLog.txt | 7 +++++++ linden/indra/newview/llagent.cpp | 7 +++++++ linden/indra/newview/llagent.h | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 41d922d..b26fc7e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,12 @@ 2009-05-24 Jacek Antonelli + * linden/indra/newview/llagent.cpp: + Moved LLAgent::teleportHome() definition. + Was in llagent.h for no good reason, now in llagent.cpp. + * linden/indra/newview/llagent.h: + Ditto. + + * linden/indra/newview/skins/default/xui/en-us/alerts.xml: Added ConfirmTeleportHome alert text. 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; diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h index 97f9aed..bc06e92 100644 --- a/linden/indra/newview/llagent.h +++ b/linden/indra/newview/llagent.h @@ -462,7 +462,7 @@ public: void teleportViaLandmark(const LLUUID& landmark_id); // go home - void teleportHome() { teleportViaLandmark(LLUUID::null); } + void teleportHome(); // to an invited location void teleportViaLure(const LLUUID& lure_id, BOOL godlike); -- cgit v1.1