diff options
author | Melanie Thielker | 2008-11-16 04:31:52 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-16 04:31:52 +0000 |
commit | 3de41ea3777487ee4cc25a4185de1bc63950ba6a (patch) | |
tree | 17ebfa5dedd4b9490e8f21cbf6e54436f10b27a1 | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC-3de41ea3777487ee4cc25a4185de1bc63950ba6a.zip opensim-SC-3de41ea3777487ee4cc25a4185de1bc63950ba6a.tar.gz opensim-SC-3de41ea3777487ee4cc25a4185de1bc63950ba6a.tar.bz2 opensim-SC-3de41ea3777487ee4cc25a4185de1bc63950ba6a.tar.xz |
Reinstate the IM sending from scripts and from autoreturn
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7485134..e19857c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -41,6 +41,7 @@ using OpenSim.Framework.Communications; | |||
41 | using OpenSim.Framework.Communications.Cache; | 41 | using OpenSim.Framework.Communications.Cache; |
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Region.Environment.Interfaces; | 43 | using OpenSim.Region.Environment.Interfaces; |
44 | using OpenSim.Region.Interfaces; | ||
44 | using OpenSim.Region.Environment.Modules.World.Archiver; | 45 | using OpenSim.Region.Environment.Modules.World.Archiver; |
45 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 46 | using OpenSim.Region.Environment.Modules.World.Serialiser; |
46 | using OpenSim.Region.Environment.Modules.World.Terrain; | 47 | using OpenSim.Region.Environment.Modules.World.Terrain; |
@@ -993,8 +994,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
993 | else | 994 | else |
994 | msg.message = string.Format("Your object {0} was returned from {1} in region {2} due to parcel auto return", ret.Value.objectName, ret.Value.location.ToString(), RegionInfo.RegionName); | 995 | msg.message = string.Format("Your object {0} was returned from {1} in region {2} due to parcel auto return", ret.Value.objectName, ret.Value.location.ToString(), RegionInfo.RegionName); |
995 | 996 | ||
996 | // TODO: Send IM | 997 | IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>(); |
997 | // TriggerGridInstantMessage(msg); | 998 | if (tr != null) |
999 | tr.SendInstantMessage(msg, delegate(bool success) {} ); | ||
998 | } | 1000 | } |
999 | } | 1001 | } |
1000 | 1002 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 37ad554..8eff58e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2645,9 +2645,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2645 | msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); | 2645 | msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); |
2646 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; | 2646 | msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; |
2647 | msg.binaryBucket = new byte[0];// binaryBucket; | 2647 | msg.binaryBucket = new byte[0];// binaryBucket; |
2648 | // TODO: Send IM | 2648 | |
2649 | // World.TriggerGridInstantMessage(msg); | 2649 | IMessageTransferModule tr = World.RequestModuleInterface<IMessageTransferModule>(); |
2650 | // ScriptSleep(2000); | 2650 | |
2651 | if (tr != null) | ||
2652 | { | ||
2653 | tr.SendInstantMessage(msg, delegate(bool success) {} ); | ||
2654 | } | ||
2655 | ScriptSleep(2000); | ||
2651 | } | 2656 | } |
2652 | 2657 | ||
2653 | public void llEmail(string address, string subject, string message) | 2658 | public void llEmail(string address, string subject, string message) |