diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index ce6415a..e970543 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -38,20 +38,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
38 | { | 38 | { |
39 | public partial class Scene | 39 | public partial class Scene |
40 | { | 40 | { |
41 | /// <summary> | ||
42 | /// Send chat to listeners. | ||
43 | /// </summary> | ||
44 | /// <param name='message'></param> | ||
45 | /// <param name='type'>/param> | ||
46 | /// <param name='channel'></param> | ||
47 | /// <param name='fromPos'></param> | ||
48 | /// <param name='fromName'></param> | ||
49 | /// <param name='fromID'></param> | ||
50 | /// <param name='targetID'></param> | ||
51 | /// <param name='fromAgent'></param> | ||
52 | /// <param name='broadcast'></param> | ||
53 | public 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, |
54 | UUID fromID, UUID targetID, bool fromAgent, bool broadcast) | 42 | UUID fromID, bool fromAgent, bool broadcast, UUID destination) |
55 | { | 43 | { |
56 | OSChatMessage args = new OSChatMessage(); | 44 | OSChatMessage args = new OSChatMessage(); |
57 | 45 | ||
@@ -61,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
61 | args.Position = fromPos; | 49 | args.Position = fromPos; |
62 | args.SenderUUID = fromID; | 50 | args.SenderUUID = fromID; |
63 | args.Scene = this; | 51 | args.Scene = this; |
64 | args.Destination = targetID; | 52 | args.Destination = destination; |
65 | 53 | ||
66 | if (fromAgent) | 54 | if (fromAgent) |
67 | { | 55 | { |
@@ -78,10 +66,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
78 | args.From = fromName; | 66 | args.From = fromName; |
79 | //args. | 67 | //args. |
80 | 68 | ||
81 | // m_log.DebugFormat( | ||
82 | // "[SCENE]: Sending message {0} on channel {1}, type {2} from {3}, broadcast {4}", | ||
83 | // args.Message.Replace("\n", "\\n"), args.Channel, args.Type, fromName, broadcast); | ||
84 | |||
85 | if (broadcast) | 69 | if (broadcast) |
86 | EventManager.TriggerOnChatBroadcast(this, args); | 70 | EventManager.TriggerOnChatBroadcast(this, args); |
87 | else | 71 | else |
@@ -91,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
91 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, | 75 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, |
92 | UUID fromID, bool fromAgent, bool broadcast) | 76 | UUID fromID, bool fromAgent, bool broadcast) |
93 | { | 77 | { |
94 | SimChat(message, type, channel, fromPos, fromName, fromID, UUID.Zero, fromAgent, broadcast); | 78 | SimChat(message, type, channel, fromPos, fromName, fromID, fromAgent, broadcast, UUID.Zero); |
95 | } | 79 | } |
96 | 80 | ||
97 | /// <summary> | 81 | /// <summary> |
@@ -559,7 +543,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
559 | if (!InventoryService.AddFolder(folder)) | 543 | if (!InventoryService.AddFolder(folder)) |
560 | { | 544 | { |
561 | m_log.WarnFormat( | 545 | m_log.WarnFormat( |
562 | "[AGENT INVENTORY]: Failed to create folder for user {0} {1}", | 546 | "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", |
563 | remoteClient.Name, remoteClient.AgentId); | 547 | remoteClient.Name, remoteClient.AgentId); |
564 | } | 548 | } |
565 | } | 549 | } |