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/Scripting/WorldComm/WorldCommModule.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/Scripting/WorldComm/WorldCommModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 1c3a714..93a4f09 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -380,28 +380,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
380 | 380 | ||
381 | if (sp != null) | 381 | if (sp != null) |
382 | { | 382 | { |
383 | <<<<<<< HEAD | 383 | // Send message to avatar |
384 | // ignore if a child agent this is restricted to inside one | ||
385 | // region | ||
386 | if (sp.IsChildAgent) | ||
387 | return; | ||
388 | |||
389 | // Channel zero only goes to the avatar | ||
390 | // non zero channel messages only go to the attachments of the avatar. | ||
391 | if (channel != 0) | ||
392 | { | ||
393 | List<SceneObjectGroup> attachments = sp.GetAttachments(); | ||
394 | if (attachments.Count == 0) | ||
395 | return; | ||
396 | ======= | ||
397 | // Send message to avatar | ||
398 | if (channel == 0) | 384 | if (channel == 0) |
399 | { | 385 | { |
400 | // Channel 0 goes to viewer ONLY | 386 | // Channel 0 goes to viewer ONLY |
401 | m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); | 387 | m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false); |
402 | return true; | 388 | return true; |
403 | } | 389 | } |
404 | >>>>>>> avn/ubitvar | ||
405 | 390 | ||
406 | List<SceneObjectGroup> attachments = sp.GetAttachments(); | 391 | List<SceneObjectGroup> attachments = sp.GetAttachments(); |
407 | 392 | ||