aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2009-05-24 21:52:44 -0500
committerJacek Antonelli2009-05-25 18:37:34 -0500
commit032d19bdea92fbc4d584fb630a37ceccb07a5a40 (patch)
tree5accbe86286279499ef21f72863fe21a6a6365d9 /linden/indra/newview
parentAdded ConfirmTeleportHome alert text. (diff)
downloadmeta-impy-032d19bdea92fbc4d584fb630a37ceccb07a5a40.zip
meta-impy-032d19bdea92fbc4d584fb630a37ceccb07a5a40.tar.gz
meta-impy-032d19bdea92fbc4d584fb630a37ceccb07a5a40.tar.bz2
meta-impy-032d19bdea92fbc4d584fb630a37ceccb07a5a40.tar.xz
Moved LLAgent::teleportHome() definition.
Was in llagent.h for no good reason, now in llagent.cpp.
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llagent.cpp7
-rw-r--r--linden/indra/newview/llagent.h2
2 files changed, 8 insertions, 1 deletions
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)
5926 } 5926 }
5927} 5927}
5928 5928
5929
5930void LLAgent::teleportHome()
5931{
5932 teleportViaLandmark(LLUUID::null);
5933}
5934
5935
5929void LLAgent::setTeleportState(ETeleportState state) 5936void LLAgent::setTeleportState(ETeleportState state)
5930{ 5937{
5931 mTeleportState = state; 5938 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:
462 void teleportViaLandmark(const LLUUID& landmark_id); 462 void teleportViaLandmark(const LLUUID& landmark_id);
463 463
464 // go home 464 // go home
465 void teleportHome() { teleportViaLandmark(LLUUID::null); } 465 void teleportHome();
466 466
467 // to an invited location 467 // to an invited location
468 void teleportViaLure(const LLUUID& lure_id, BOOL godlike); 468 void teleportViaLure(const LLUUID& lure_id, BOOL godlike);