diff options
author | onefang | 2019-07-24 18:27:05 +1000 |
---|---|---|
committer | onefang | 2019-07-24 18:27:05 +1000 |
commit | 55262c8e1c6338662e0cff6563fe500531edfe32 (patch) | |
tree | 80bac107c3effaef8e2b5db07e6dbe4aa9084751 /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Make the installation more robust. (diff) | |
download | opensim-SC_OLD-55262c8e1c6338662e0cff6563fe500531edfe32.zip opensim-SC_OLD-55262c8e1c6338662e0cff6563fe500531edfe32.tar.gz opensim-SC_OLD-55262c8e1c6338662e0cff6563fe500531edfe32.tar.bz2 opensim-SC_OLD-55262c8e1c6338662e0cff6563fe500531edfe32.tar.xz |
Allow sitting on attachments, and attaching tings with people sitting on them.
Now we have to fix all the viewers that though it would be great to
enshrine this bug in viewer side.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 4afac28..f99cf4c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -485,15 +485,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
485 | // group.Name, group.LocalId, sp.Name, attachmentPt, silent); | 485 | // group.Name, group.LocalId, sp.Name, attachmentPt, silent); |
486 | 486 | ||
487 | 487 | ||
488 | if (group.GetSittingAvatarsCount() != 0) | 488 | //// if (group.GetSittingAvatarsCount() != 0) |
489 | { | 489 | //// { |
490 | if (DebugLevel > 0) | 490 | //// if (DebugLevel > 0) |
491 | m_log.WarnFormat( | 491 | //// m_log.WarnFormat( |
492 | "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it", | 492 | //// "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it", |
493 | group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount()); | 493 | //// group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount()); |
494 | 494 | //// | |
495 | return false; | 495 | //// return false; |
496 | } | 496 | //// } |
497 | 497 | ||
498 | List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt); | 498 | List<SceneObjectGroup> attachments = sp.GetAttachments(attachmentPt); |
499 | if (attachments.Contains(group)) | 499 | if (attachments.Contains(group)) |