diff options
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/llagent.cpp | 7 | ||||
-rw-r--r-- | linden/indra/newview/llagent.h | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 41d922d..b26fc7e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,12 @@ | |||
1 | 2009-05-24 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2009-05-24 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llagent.cpp: | ||
4 | Moved LLAgent::teleportHome() definition. | ||
5 | Was in llagent.h for no good reason, now in llagent.cpp. | ||
6 | * linden/indra/newview/llagent.h: | ||
7 | Ditto. | ||
8 | |||
9 | |||
3 | * linden/indra/newview/skins/default/xui/en-us/alerts.xml: | 10 | * linden/indra/newview/skins/default/xui/en-us/alerts.xml: |
4 | Added ConfirmTeleportHome alert text. | 11 | Added ConfirmTeleportHome alert text. |
5 | 12 | ||
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 | |||
5930 | void LLAgent::teleportHome() | ||
5931 | { | ||
5932 | teleportViaLandmark(LLUUID::null); | ||
5933 | } | ||
5934 | |||
5935 | |||
5929 | void LLAgent::setTeleportState(ETeleportState state) | 5936 | void 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); |