aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-13 23:29:54 +0000
committerMelanie Thielker2009-01-13 23:29:54 +0000
commit1c3542303c11b2186fe23268266c02e717cc5aae (patch)
tree09a521a1a9944be8e2a6ce0c721a809efab8d76f /OpenSim/Region/Environment/Modules/Avatar
parent* Add a second logoffuser message with the region secret. (diff)
downloadopensim-SC_OLD-1c3542303c11b2186fe23268266c02e717cc5aae.zip
opensim-SC_OLD-1c3542303c11b2186fe23268266c02e717cc5aae.tar.gz
opensim-SC_OLD-1c3542303c11b2186fe23268266c02e717cc5aae.tar.bz2
opensim-SC_OLD-1c3542303c11b2186fe23268266c02e717cc5aae.tar.xz
Change fake parcel ids to allow a Z coordinate. Change TP by lure
to also transmit and use a Z coordinate.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
index 7228dd6..7bb6843 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Lure/LureModule.cs
@@ -119,7 +119,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Lure
119 UUID dest = Util.BuildFakeParcelID( 119 UUID dest = Util.BuildFakeParcelID(
120 scene.RegionInfo.RegionHandle, 120 scene.RegionInfo.RegionHandle,
121 (uint)presence.AbsolutePosition.X, 121 (uint)presence.AbsolutePosition.X,
122 (uint)presence.AbsolutePosition.Y); 122 (uint)presence.AbsolutePosition.Y,
123 (uint)presence.AbsolutePosition.Z);
123 124
124 m_log.DebugFormat("TP invite with message {0}", message); 125 m_log.DebugFormat("TP invite with message {0}", message);
125 126
@@ -146,13 +147,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Lure
146 ulong handle = 0; 147 ulong handle = 0;
147 uint x = 128; 148 uint x = 128;
148 uint y = 128; 149 uint y = 128;
150 uint z = 70;
149 151
150 Util.ParseFakeParcelID(lureID, out handle, out x, out y); 152 Util.ParseFakeParcelID(lureID, out handle, out x, out y, out z);
151 153
152 Vector3 position = new Vector3(); 154 Vector3 position = new Vector3();
153 position.X = (float)x; 155 position.X = (float)x;
154 position.Y = (float)y; 156 position.Y = (float)y;
155 position.Z = 0.0f; 157 position.Z = (float)z;
156 158
157 scene.RequestTeleportLocation(client, handle, position, 159 scene.RequestTeleportLocation(client, handle, position,
158 Vector3.Zero, teleportFlags); 160 Vector3.Zero, teleportFlags);