diff options
author | Melanie | 2012-10-07 02:48:28 +0100 |
---|---|---|
committer | Melanie | 2012-10-07 02:48:28 +0100 |
commit | f7df68d922758c0a78664abe82d631579f6aa63f (patch) | |
tree | 85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Region/CoreModules/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff) | |
download | opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.zip opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2 opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 22 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 1 |
2 files changed, 18 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index c5bb9a5..e355ebf 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -1028,6 +1028,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1028 | Scene initiatingScene) | 1028 | Scene initiatingScene) |
1029 | { | 1029 | { |
1030 | Thread.Sleep(10000); | 1030 | Thread.Sleep(10000); |
1031 | |||
1031 | IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); | 1032 | IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>(); |
1032 | if (im != null) | 1033 | if (im != null) |
1033 | { | 1034 | { |
@@ -1040,11 +1041,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1040 | (uint)(int)position.X, | 1041 | (uint)(int)position.X, |
1041 | (uint)(int)position.Y, | 1042 | (uint)(int)position.Y, |
1042 | (uint)(int)position.Z); | 1043 | (uint)(int)position.Z); |
1043 | GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero, | 1044 | |
1044 | "Region", agent.UUID, | 1045 | GridInstantMessage m |
1045 | (byte)InstantMessageDialog.GodLikeRequestTeleport, false, | 1046 | = new GridInstantMessage( |
1046 | "", gotoLocation, false, new Vector3(127, 0, 0), | 1047 | initiatingScene, |
1047 | new Byte[0]); | 1048 | UUID.Zero, |
1049 | "Region", | ||
1050 | agent.UUID, | ||
1051 | (byte)InstantMessageDialog.GodLikeRequestTeleport, | ||
1052 | false, | ||
1053 | "", | ||
1054 | gotoLocation, | ||
1055 | false, | ||
1056 | new Vector3(127, 0, 0), | ||
1057 | new Byte[0], | ||
1058 | false); | ||
1059 | |||
1048 | im.SendInstantMessage(m, delegate(bool success) | 1060 | im.SendInstantMessage(m, delegate(bool success) |
1049 | { | 1061 | { |
1050 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success); | 1062 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success); |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index 36c84c7..b4811da 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -31,6 +31,7 @@ using System.Reflection; | |||
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Framework.Console; | 33 | using OpenSim.Framework.Console; |
34 | using OpenSim.Region.ClientStack.LindenUDP; | ||
34 | using OpenSim.Region.Framework; | 35 | using OpenSim.Region.Framework; |
35 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |