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

fixes #2445 & #2449. interim fix that will make listeners work 

again. need to investigate why chat position is catastrophically off.
0.6.0-stable
Dr Scofield 2008-10-21 08:51:27 +00:00
parent 931b04485d
commit fd108872d8
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Environment/Modules/Scripting/WorldComm/WorldCommModule.cs
View File

@ -34,8 +34,8 @@ using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
// using log4net; using log4net;
// using System.Reflection; using System.Reflection;
/***************************************************** /*****************************************************
@ -205,6 +205,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
m_listenerManager.DeleteListener(itemID); m_listenerManager.DeleteListener(itemID);
} }
protected static Vector3 CenterOfRegion = new Vector3(128, 128, 20);
public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg) public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg)
{ {
Vector3 position; Vector3 position;
@ -215,6 +218,8 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
position = source.AbsolutePosition; position = source.AbsolutePosition;
else if ((avatar = m_scene.GetScenePresence(id)) != null) else if ((avatar = m_scene.GetScenePresence(id)) != null)
position = avatar.AbsolutePosition; position = avatar.AbsolutePosition;
else if (ChatTypeEnum.Region == type)
position = CenterOfRegion;
else else
return; return;
@ -236,6 +241,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
/// <param name="msg">msg to sent</param> /// <param name="msg">msg to sent</param>
public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg, Vector3 position) public void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg, Vector3 position)
{ {
// m_log.DebugFormat("[WorldComm] got[2] type {0}, channel {1}, name {2}, id {3}, msg {4}",
// type, channel, name, id, msg);
// Determine which listen event filters match the given set of arguments, this results // Determine which listen event filters match the given set of arguments, this results
// in a limited set of listeners, each belonging a host. If the host is in range, add them // in a limited set of listeners, each belonging a host. If the host is in range, add them
// to the pending queue. // to the pending queue.
@ -328,9 +336,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
private void DeliverClientMessage(Object sender, OSChatMessage e) private void DeliverClientMessage(Object sender, OSChatMessage e)
{ {
if (null != e.Sender) if (null != e.Sender)
DeliverMessage(e.Type, e.Channel, e.Sender.Name, e.Sender.AgentId, e.Message, e.Position); DeliverMessage(e.Type, e.Channel, e.Sender.Name, e.Sender.AgentId, e.Message); // , e.Position);
else else
DeliverMessage(e.Type, e.Channel, e.From, UUID.Zero, e.Message, e.Position); DeliverMessage(e.Type, e.Channel, e.From, UUID.Zero, e.Message); // , e.Position);
} }
public Object[] GetSerializationData(UUID itemID) public Object[] GetSerializationData(UUID itemID)