OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reinstate the IM sending from scripts and from autoreturn

0.6.1-post-fixes
Melanie Thielker 2008-11-16 04:31:52 +00:00
parent 55e2ede065
commit 3de41ea377
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -41,6 +41,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment.Modules.World.Archiver; using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain;
@ -993,8 +994,9 @@ namespace OpenSim.Region.Environment.Scenes
else else
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); 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);
// TODO: Send IM IMessageTransferModule tr = RequestModuleInterface<IMessageTransferModule>();
// TriggerGridInstantMessage(msg); if (tr != null)
tr.SendInstantMessage(msg, delegate(bool success) {} );
} }
} }

11
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -2645,9 +2645,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition);
msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
msg.binaryBucket = new byte[0];// binaryBucket; msg.binaryBucket = new byte[0];// binaryBucket;
// TODO: Send IM
// World.TriggerGridInstantMessage(msg); IMessageTransferModule tr = World.RequestModuleInterface<IMessageTransferModule>();
// ScriptSleep(2000);
if (tr != null)
{
tr.SendInstantMessage(msg, delegate(bool success) {} );
}
ScriptSleep(2000);
} }
public void llEmail(string address, string subject, string message) public void llEmail(string address, string subject, string message)