aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Lure
diff options
context:
space:
mode:
authorMelanie2010-11-28 20:14:58 +0100
committerMelanie2010-11-28 20:14:58 +0100
commit0f1fc7999417a2e1188de26d4ac9c881ea7bb684 (patch)
tree68f89d29dbc81974ebd5a08ec76bb041f5806a8a /OpenSim/Region/CoreModules/Avatar/Lure
parentRemove hard limit on prim owners. The new LibOMV autosplits packets to (diff)
downloadopensim-SC_OLD-0f1fc7999417a2e1188de26d4ac9c881ea7bb684.zip
opensim-SC_OLD-0f1fc7999417a2e1188de26d4ac9c881ea7bb684.tar.gz
opensim-SC_OLD-0f1fc7999417a2e1188de26d4ac9c881ea7bb684.tar.bz2
opensim-SC_OLD-0f1fc7999417a2e1188de26d4ac9c881ea7bb684.tar.xz
Implement god summons
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Lure')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs28
1 files changed, 21 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index d1d7df2..a09e72b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -150,12 +150,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
150 150
151 m_log.DebugFormat("TP invite with message {0}", message); 151 m_log.DebugFormat("TP invite with message {0}", message);
152 152
153 GridInstantMessage m = new GridInstantMessage(scene, client.AgentId, 153 GridInstantMessage m;
154 client.FirstName+" "+client.LastName, targetid, 154
155 (byte)InstantMessageDialog.RequestTeleport, false, 155 if (scene.Permissions.IsAdministrator(client.AgentId) && presence.GodLevel >= 200 && (scene.Permissions.IsAdministrator(targetid)))
156 message, dest, false, presence.AbsolutePosition, 156 {
157 new Byte[0]); 157 m = new GridInstantMessage(scene, client.AgentId,
158 158 client.FirstName+" "+client.LastName, targetid,
159 (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
160 message, dest, false, presence.AbsolutePosition,
161 new Byte[0]);
162 }
163 else
164 {
165 m = new GridInstantMessage(scene, client.AgentId,
166 client.FirstName+" "+client.LastName, targetid,
167 (byte)InstantMessageDialog.RequestTeleport, false,
168 message, dest, false, presence.AbsolutePosition,
169 new Byte[0]);
170 }
171
159 if (m_TransferModule != null) 172 if (m_TransferModule != null)
160 { 173 {
161 m_TransferModule.SendInstantMessage(m, 174 m_TransferModule.SendInstantMessage(m,
@@ -190,7 +203,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
190 { 203 {
191 // Forward remote teleport requests 204 // Forward remote teleport requests
192 // 205 //
193 if (msg.dialog != 22) 206 if (msg.dialog != (byte)InstantMessageDialog.RequestTeleport &&
207 msg.dialog != (byte)InstantMessageDialog.GodLikeRequestTeleport)
194 return; 208 return;
195 209
196 if (m_TransferModule != null) 210 if (m_TransferModule != null)