remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this are still merge issues
parent
36f7e96392
commit
278687b1e8
|
@ -311,6 +311,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
|
||||||
// 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.
|
||||||
|
|
||||||
foreach (ListenerInfo li
|
foreach (ListenerInfo li
|
||||||
in m_listenerManager.GetListeners(UUID.Zero, channel,
|
in m_listenerManager.GetListeners(UUID.Zero, channel,
|
||||||
name, id, msg))
|
name, id, msg))
|
||||||
|
@ -386,6 +387,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// for now messages to prims don't cross regions
|
||||||
|
if(sp.IsChildAgent)
|
||||||
|
return false;
|
||||||
|
|
||||||
List<SceneObjectGroup> attachments = sp.GetAttachments();
|
List<SceneObjectGroup> attachments = sp.GetAttachments();
|
||||||
|
|
||||||
if (attachments.Count == 0)
|
if (attachments.Count == 0)
|
||||||
|
|
|
@ -1264,8 +1264,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
|
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
|
|
||||||
World.SimChat(Utils.StringToBytes(text),
|
// debug channel is also sent to avatars
|
||||||
ChatTypeEnum.Region, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, false);
|
if (channelID == ScriptBaseClass.DEBUG_CHANNEL)
|
||||||
|
{
|
||||||
|
World.SimChat(Utils.StringToBytes(text),
|
||||||
|
ChatTypeEnum.Shout, channelID, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
|
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
|
||||||
if (wComm != null)
|
if (wComm != null)
|
||||||
|
@ -1280,16 +1285,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
|
|
||||||
if (channel == ScriptBaseClass.DEBUG_CHANNEL)
|
if (channel == ScriptBaseClass.DEBUG_CHANNEL)
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
UUID TargetID;
|
UUID TargetID;
|
||||||
UUID.TryParse(target, out TargetID);
|
UUID.TryParse(target, out TargetID);
|
||||||
|
|
||||||
World.SimChatToAgent(TargetID, Utils.StringToBytes(msg),
|
|
||||||
channel, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
|
|
||||||
|
|
||||||
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
|
IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
|
||||||
if (wComm != null)
|
if (wComm != null)
|
||||||
wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
|
wComm.DeliverMessageTo(TargetID, channel, m_host.AbsolutePosition, m_host.Name, m_host.UUID, msg);
|
||||||
|
|
Loading…
Reference in New Issue