diff options
author | Dan Lake | 2012-10-08 15:25:26 -0700 |
---|---|---|
committer | Dan Lake | 2012-10-08 15:25:26 -0700 |
commit | d342adaa8760ee7ada1b87dec1c8c415c9e77f73 (patch) | |
tree | a914c203322b761640450c7be06c54984b64494d /OpenSim/Region/CoreModules/Framework | |
parent | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ... (diff) | |
parent | Fix build break (diff) | |
download | opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.zip opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.gz opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.bz2 opensim-SC_OLD-d342adaa8760ee7ada1b87dec1c8c415c9e77f73.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b51570f..617a350 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1068,6 +1068,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1068 | Scene initiatingScene) | 1068 | Scene initiatingScene) |
1069 | { | 1069 | { |
1070 | Thread.Sleep(10000); | 1070 | Thread.Sleep(10000); |
1071 | |||
1071 | IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); | 1072 | IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); |
1072 | if (im != null) | 1073 | if (im != null) |
1073 | { | 1074 | { |
@@ -1080,11 +1081,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1080 | (uint)(int)position.X, | 1081 | (uint)(int)position.X, |
1081 | (uint)(int)position.Y, | 1082 | (uint)(int)position.Y, |
1082 | (uint)(int)position.Z); | 1083 | (uint)(int)position.Z); |
1083 | GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero, | 1084 | |
1084 | "Region", agent.UUID, | 1085 | GridInstantMessage m |
1085 | (byte)InstantMessageDialog.GodLikeRequestTeleport, false, | 1086 | = new GridInstantMessage( |
1086 | "", gotoLocation, false, new Vector3(127, 0, 0), | 1087 | initiatingScene, |
1087 | new Byte[0]); | 1088 | UUID.Zero, |
1089 | "Region", | ||
1090 | agent.UUID, | ||
1091 | (byte)InstantMessageDialog.GodLikeRequestTeleport, | ||
1092 | false, | ||
1093 | "", | ||
1094 | gotoLocation, | ||
1095 | false, | ||
1096 | new Vector3(127, 0, 0), | ||
1097 | new Byte[0], | ||
1098 | false); | ||
1099 | |||
1088 | im.SendInstantMessage(m, delegate(bool success) | 1100 | im.SendInstantMessage(m, delegate(bool success) |
1089 | { | 1101 | { |
1090 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success); | 1102 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success); |