Applied #472: teleport history from Emerald, patch by Ansariel Hiler, feature originally by Zi Ree

1 files changed, 29 insertions, 0 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 38e1c0f..03d5c65 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -6102,6 +6102,10 @@ void LLAgent::teleportRequest(
         const LLVector3& pos_local)
 {
         LLViewerRegion* regionp = getRegion();
+
+        // Set last region data for teleport history
+        gAgent.setLastRegionData(regionp->getName(),gAgent.getPositionAgent());
+
         if(regionp && teleportCore())
         {
                 llinfos << "TeleportRequest: '" << region_handle << "':" << pos_local
@@ -6133,6 +6137,10 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 // [/RLVa:KB]
 
         LLViewerRegion *regionp = getRegion();
+
+        // Set last region data for teleport history
+        gAgent.setLastRegionData(regionp->getName(),gAgent.getPositionAgent());
+
         if(regionp && teleportCore())
         {
                 LLMessageSystem* msg = gMessageSystem;
@@ -6148,6 +6156,10 @@ void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 void LLAgent::teleportViaLure(const LLUUID& lure_id, BOOL godlike)
 {
         LLViewerRegion* regionp = getRegion();
+
+        // Set last region data for teleport history
+        gAgent.setLastRegionData(regionp->getName(),gAgent.getPositionAgent());
+
         if(regionp && teleportCore())
         {
                 U32 teleport_flags = 0x0;
@@ -8082,4 +8094,21 @@ void LLAgent::parseTeleportMessages(const std::string& xml_filename)
         }//end for (all message sets in xml file)
 }
 
+void LLAgent::setLastRegionData(std::string regionName, LLVector3 agentCoords)
+{
+        mLastRegion = regionName;
+        mLastCoordinates = agentCoords;
+}
+
+std::string LLAgent::getLastRegion()
+{
+        return mLastRegion;
+}
+
+LLVector3 LLAgent::getLastCoords()
+{
+        return mLastCoordinates;
+}
+
+
 // EOF