diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 2d4cffd..a889984 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -161,16 +161,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
161 | scene.RegionInfo.RegionHandle, | 161 | scene.RegionInfo.RegionHandle, |
162 | (uint)presence.AbsolutePosition.X, | 162 | (uint)presence.AbsolutePosition.X, |
163 | (uint)presence.AbsolutePosition.Y, | 163 | (uint)presence.AbsolutePosition.Y, |
164 | (uint)Math.Ceiling(presence.AbsolutePosition.Z)); | 164 | (uint)presence.AbsolutePosition.Z + 2); |
165 | 165 | ||
166 | m_log.DebugFormat("TP invite with message {0}", message); | 166 | m_log.DebugFormat("[LURE]: TP invite with message {0}", message); |
167 | |||
168 | GridInstantMessage m; | ||
169 | |||
170 | if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (!scene.Permissions.IsAdministrator(targetid))) | ||
171 | { | ||
172 | m = new GridInstantMessage(scene, client.AgentId, | ||
173 | client.FirstName+" "+client.LastName, targetid, | ||
174 | (byte)InstantMessageDialog.GodLikeRequestTeleport, false, | ||
175 | message, dest, false, presence.AbsolutePosition, | ||
176 | new Byte[0]); | ||
177 | } | ||
178 | else | ||
179 | { | ||
180 | m = new GridInstantMessage(scene, client.AgentId, | ||
181 | client.FirstName+" "+client.LastName, targetid, | ||
182 | (byte)InstantMessageDialog.RequestTeleport, false, | ||
183 | message, dest, false, presence.AbsolutePosition, | ||
184 | new Byte[0]); | ||
185 | } | ||
167 | 186 | ||
168 | GridInstantMessage m = new GridInstantMessage(scene, client.AgentId, | ||
169 | client.FirstName+" "+client.LastName, targetid, | ||
170 | (byte)InstantMessageDialog.RequestTeleport, false, | ||
171 | message, dest, false, presence.AbsolutePosition, | ||
172 | new Byte[0]); | ||
173 | |||
174 | if (m_TransferModule != null) | 187 | if (m_TransferModule != null) |
175 | { | 188 | { |
176 | m_TransferModule.SendInstantMessage(m, | 189 | m_TransferModule.SendInstantMessage(m, |
@@ -205,7 +218,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
205 | { | 218 | { |
206 | // Forward remote teleport requests | 219 | // Forward remote teleport requests |
207 | // | 220 | // |
208 | if (msg.dialog != 22) | 221 | if (msg.dialog != (byte)InstantMessageDialog.RequestTeleport && |
222 | msg.dialog != (byte)InstantMessageDialog.GodLikeRequestTeleport) | ||
209 | return; | 223 | return; |
210 | 224 | ||
211 | if (m_TransferModule != null) | 225 | if (m_TransferModule != null) |