diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 2801ef0..0b5d95b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -214,13 +214,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
214 | UUID destination = c.Destination; | 214 | UUID destination = c.Destination; |
215 | Vector3 fromPos = c.Position; | 215 | Vector3 fromPos = c.Position; |
216 | Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0); | 216 | Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0); |
217 | <<<<<<< HEAD | ||
218 | ======= | ||
219 | 217 | ||
220 | bool checkParcelHide = false; | 218 | bool checkParcelHide = false; |
221 | UUID sourceParcelID = UUID.Zero; | 219 | UUID sourceParcelID = UUID.Zero; |
222 | Vector3 hidePos = fromPos; | 220 | Vector3 hidePos = fromPos; |
223 | >>>>>>> avn/ubitvar | ||
224 | 221 | ||
225 | if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; | 222 | if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel; |
226 | 223 | ||
@@ -377,27 +374,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
377 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); | 374 | // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); |
378 | HashSet<UUID> receiverIDs = new HashSet<UUID>(); | 375 | HashSet<UUID> receiverIDs = new HashSet<UUID>(); |
379 | 376 | ||
380 | <<<<<<< HEAD | ||
381 | ((Scene)c.Scene).ForEachRootClient( | ||
382 | delegate(IClientAPI client) | ||
383 | { | ||
384 | // don't forward SayOwner chat from objects to | ||
385 | // non-owner agents | ||
386 | if ((c.Type == ChatTypeEnum.Owner) && | ||
387 | (null != c.SenderObject) && | ||
388 | (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) | ||
389 | return; | ||
390 | |||
391 | client.SendChatMessage( | ||
392 | c.Message, (byte)cType, CenterOfRegion, fromName, fromID, ownerID, | ||
393 | (byte)sourceType, (byte)ChatAudibleLevel.Fully); | ||
394 | |||
395 | receiverIDs.Add(client.AgentId); | ||
396 | }); | ||
397 | |||
398 | (c.Scene as Scene).EventManager.TriggerOnChatToClients( | ||
399 | fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully); | ||
400 | ======= | ||
401 | if (c.Scene != null) | 377 | if (c.Scene != null) |
402 | { | 378 | { |
403 | ((Scene)c.Scene).ForEachRootClient | 379 | ((Scene)c.Scene).ForEachRootClient |
@@ -419,7 +395,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
419 | (c.Scene as Scene).EventManager.TriggerOnChatToClients( | 395 | (c.Scene as Scene).EventManager.TriggerOnChatToClients( |
420 | fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully); | 396 | fromID, receiverIDs, c.Message, cType, CenterOfRegion, fromName, sourceType, ChatAudibleLevel.Fully); |
421 | } | 397 | } |
422 | >>>>>>> avn/ubitvar | ||
423 | } | 398 | } |
424 | 399 | ||
425 | /// <summary> | 400 | /// <summary> |