aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-06-28 21:23:42 +0200
committerMelanie2012-06-28 21:23:42 +0200
commitc87f0ac2261d1aa5226957aff63bfc8ac0efaffd (patch)
tree5a8ac8569730595044c9310a1f5321bff1f5e109 /OpenSim/Region/Framework/Scenes
parentReturn NPC instead of AGENT in the detect parameters for touch, collision and (diff)
downloadopensim-SC-c87f0ac2261d1aa5226957aff63bfc8ac0efaffd.zip
opensim-SC-c87f0ac2261d1aa5226957aff63bfc8ac0efaffd.tar.gz
opensim-SC-c87f0ac2261d1aa5226957aff63bfc8ac0efaffd.tar.bz2
opensim-SC-c87f0ac2261d1aa5226957aff63bfc8ac0efaffd.tar.xz
Fix llRegionSayTo the right way
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 3ef1e29..431b903 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public partial class Scene 39 public partial class Scene
40 { 40 {
41 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, 41 public void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
42 UUID fromID, bool fromAgent, bool broadcast) 42 UUID fromID, bool fromAgent, bool broadcast, UUID destination)
43 { 43 {
44 OSChatMessage args = new OSChatMessage(); 44 OSChatMessage args = new OSChatMessage();
45 45
@@ -49,6 +49,7 @@ namespace OpenSim.Region.Framework.Scenes
49 args.Position = fromPos; 49 args.Position = fromPos;
50 args.SenderUUID = fromID; 50 args.SenderUUID = fromID;
51 args.Scene = this; 51 args.Scene = this;
52 args.Destination = destination;
52 53
53 if (fromAgent) 54 if (fromAgent)
54 { 55 {
@@ -71,6 +72,12 @@ namespace OpenSim.Region.Framework.Scenes
71 EventManager.TriggerOnChatFromWorld(this, args); 72 EventManager.TriggerOnChatFromWorld(this, args);
72 } 73 }
73 74
75 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
76 UUID fromID, bool fromAgent, bool broadcast)
77 {
78 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, broadcast, UUID.Zero);
79 }
80
74 /// <summary> 81 /// <summary>
75 /// 82 ///
76 /// </summary> 83 /// </summary>