diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index dbbb0ae..4407e40 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -197,6 +197,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
197 | string fromName = c.From; | 197 | string fromName = c.From; |
198 | string fromNamePrefix = ""; | 198 | string fromNamePrefix = ""; |
199 | UUID fromID = UUID.Zero; | 199 | UUID fromID = UUID.Zero; |
200 | UUID ownerID = UUID.Zero; | ||
200 | string message = c.Message; | 201 | string message = c.Message; |
201 | IScene scene = c.Scene; | 202 | IScene scene = c.Scene; |
202 | UUID destination = c.Destination; | 203 | UUID destination = c.Destination; |
@@ -224,11 +225,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
224 | fromNamePrefix = m_adminPrefix; | 225 | fromNamePrefix = m_adminPrefix; |
225 | } | 226 | } |
226 | destination = UUID.Zero; // Avatars cant "SayTo" | 227 | destination = UUID.Zero; // Avatars cant "SayTo" |
228 | ownerID = c.Sender.AgentId; | ||
229 | |||
227 | break; | 230 | break; |
228 | 231 | ||
229 | case ChatSourceType.Object: | 232 | case ChatSourceType.Object: |
230 | fromID = c.SenderUUID; | 233 | fromID = c.SenderUUID; |
231 | 234 | ||
235 | if (c.SenderObject != null && c.SenderObject is SceneObjectPart) | ||
236 | ownerID = ((SceneObjectPart)c.SenderObject).OwnerID; | ||
237 | |||
232 | break; | 238 | break; |
233 | } | 239 | } |
234 | 240 | ||
@@ -262,8 +268,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
262 | // objects on a parcel with access restrictions | 268 | // objects on a parcel with access restrictions |
263 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) | 269 | if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true) |
264 | { | 270 | { |
265 | if (TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix + fromName, c.Type, message, sourceType)) | 271 | if (destination != UUID.Zero) |
266 | receiverIDs.Add(presence.UUID); | 272 | { |
273 | if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, true)) | ||
274 | receiverIDs.Add(presence.UUID); | ||
275 | } | ||
276 | else | ||
277 | { | ||
278 | if (TrySendChatMessage(presence, fromPos, regionPos, fromID, ownerID, fromNamePrefix + fromName, c.Type, message, sourceType, false)) | ||
279 | receiverIDs.Add(presence.UUID); | ||
280 | } | ||
267 | } | 281 | } |
268 | } | 282 | } |
269 | } | 283 | } |
@@ -324,7 +338,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
324 | (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) | 338 | (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) |
325 | return; | 339 | return; |
326 | 340 | ||
327 | client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, | 341 | client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, fromID, |
328 | (byte)sourceType, (byte)ChatAudibleLevel.Fully); | 342 | (byte)sourceType, (byte)ChatAudibleLevel.Fully); |
329 | receiverIDs.Add(client.AgentId); | 343 | receiverIDs.Add(client.AgentId); |
330 | } | 344 | } |
@@ -341,15 +355,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
341 | /// <param name="fromPos"></param> | 355 | /// <param name="fromPos"></param> |
342 | /// <param name="regionPos">/param> | 356 | /// <param name="regionPos">/param> |
343 | /// <param name="fromAgentID"></param> | 357 | /// <param name="fromAgentID"></param> |
358 | /// <param name='ownerID'> | ||
359 | /// Owner of the message. For at least some messages from objects, this has to be correctly filled with the owner's UUID. | ||
360 | /// This is the case for script error messages in viewer 3 since LLViewer change EXT-7762 | ||
361 | /// </param> | ||
344 | /// <param name="fromName"></param> | 362 | /// <param name="fromName"></param> |
345 | /// <param name="type"></param> | 363 | /// <param name="type"></param> |
346 | /// <param name="message"></param> | 364 | /// <param name="message"></param> |
347 | /// <param name="src"></param> | 365 | /// <param name="src"></param> |
348 | /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a | 366 | /// <returns>true if the message was sent to the receiver, false if it was not sent due to failing a |
349 | /// precondition</returns> | 367 | /// precondition</returns> |
350 | protected virtual bool TrySendChatMessage(ScenePresence presence, Vector3 fromPos, Vector3 regionPos, | 368 | protected virtual bool TrySendChatMessage( |
351 | UUID fromAgentID, string fromName, ChatTypeEnum type, | 369 | ScenePresence presence, Vector3 fromPos, Vector3 regionPos, |
352 | string message, ChatSourceType src) | 370 | UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type, |
371 | string message, ChatSourceType src, bool ignoreDistance) | ||
353 | { | 372 | { |
354 | // don't send chat to child agents | 373 | // don't send chat to child agents |
355 | if (presence.IsChildAgent) return false; | 374 | if (presence.IsChildAgent) return false; |
@@ -369,8 +388,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
369 | } | 388 | } |
370 | 389 | ||
371 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView | 390 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView |
372 | presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, | 391 | presence.ControllingClient.SendChatMessage( |
373 | fromAgentID, (byte)src, (byte)ChatAudibleLevel.Fully); | 392 | message, (byte) type, fromPos, fromName, |
393 | fromAgentID, ownerID, (byte)src, (byte)ChatAudibleLevel.Fully); | ||
374 | 394 | ||
375 | return true; | 395 | return true; |
376 | } | 396 | } |