aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs26
1 files changed, 3 insertions, 23 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index cf68ff4..3ef1e29 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -38,9 +38,8 @@ namespace OpenSim.Region.Framework.Scenes
38{ 38{
39 public partial class Scene 39 public partial class Scene
40 { 40 {
41
42 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, 41 protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName,
43 UUID fromID, UUID targetID, bool fromAgent, bool broadcast) 42 UUID fromID, bool fromAgent, bool broadcast)
44 { 43 {
45 OSChatMessage args = new OSChatMessage(); 44 OSChatMessage args = new OSChatMessage();
46 45
@@ -64,20 +63,14 @@ namespace OpenSim.Region.Framework.Scenes
64 } 63 }
65 64
66 args.From = fromName; 65 args.From = fromName;
67 args.TargetUUID = targetID; 66 //args.
68 67
69 if (broadcast) 68 if (broadcast)
70 EventManager.TriggerOnChatBroadcast(this, args); 69 EventManager.TriggerOnChatBroadcast(this, args);
71 else 70 else
72 EventManager.TriggerOnChatFromWorld(this, args); 71 EventManager.TriggerOnChatFromWorld(this, args);
73 } 72 }
74 73
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, UUID.Zero, fromAgent, broadcast);
79 }
80
81 /// <summary> 74 /// <summary>
82 /// 75 ///
83 /// </summary> 76 /// </summary>
@@ -115,19 +108,6 @@ namespace OpenSim.Region.Framework.Scenes
115 { 108 {
116 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true); 109 SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, true);
117 } 110 }
118 /// <summary>
119 ///
120 /// </summary>
121 /// <param name="message"></param>
122 /// <param name="type"></param>
123 /// <param name="fromPos"></param>
124 /// <param name="fromName"></param>
125 /// <param name="fromAgentID"></param>
126 /// <param name="targetID"></param>
127 public void SimChatToAgent(UUID targetID, byte[] message, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent)
128 {
129 SimChat(message, ChatTypeEnum.Say, 0, fromPos, fromName, fromID, targetID, fromAgent, false);
130 }
131 111
132 /// <summary> 112 /// <summary>
133 /// Invoked when the client requests a prim. 113 /// Invoked when the client requests a prim.