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/Framework/Scenes | |
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 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ff8d2fe..6aa5047 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3419,11 +3419,11 @@ else | |||
3419 | SendSitResponse(targetID, offset, Quaternion.Identity); | 3419 | SendSitResponse(targetID, offset, Quaternion.Identity); |
3420 | } | 3420 | } |
3421 | 3421 | ||
3422 | // returns false if does not suport so older sit can be tried | 3422 | // returns false if does not support so older sit can be tried |
3423 | public bool PhysicsSit(SceneObjectPart part, Vector3 offset) | 3423 | public bool PhysicsSit(SceneObjectPart part, Vector3 offset) |
3424 | { | 3424 | { |
3425 | if (part == null || part.ParentGroup.IsAttachment) | 3425 | //// if (part == null || part.ParentGroup.IsAttachment) |
3426 | return true; | 3426 | //// return true; |
3427 | 3427 | ||
3428 | if ( m_scene.PhysicsScene == null) | 3428 | if ( m_scene.PhysicsScene == null) |
3429 | return false; | 3429 | return false; |
@@ -3549,14 +3549,14 @@ else | |||
3549 | 3549 | ||
3550 | if (part != null) | 3550 | if (part != null) |
3551 | { | 3551 | { |
3552 | if (part.ParentGroup.IsAttachment) | 3552 | //// if (part.ParentGroup.IsAttachment) |
3553 | { | 3553 | //// { |
3554 | m_log.WarnFormat( | 3554 | //// m_log.WarnFormat( |
3555 | "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}", | 3555 | //// "[SCENE PRESENCE]: Avatar {0} tried to sit on part {1} from object {2} in {3} but this is an attachment for avatar id {4}", |
3556 | Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar); | 3556 | //// Name, part.Name, part.ParentGroup.Name, Scene.Name, part.ParentGroup.AttachedAvatar); |
3557 | 3557 | //// | |
3558 | return; | 3558 | //// return; |
3559 | } | 3559 | //// } |
3560 | 3560 | ||
3561 | if (part.SitTargetAvatar == UUID) | 3561 | if (part.SitTargetAvatar == UUID) |
3562 | { | 3562 | { |