diff options
author | Melanie Thielker | 2008-11-17 00:28:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-17 00:28:47 +0000 |
commit | 74ba1bb18098325dc411dcbf2d30a6f727872e9f (patch) | |
tree | 05f93cf7e4346b727244c08f2c05d36aa395f83d | |
parent | Fix NRE on TP-to-home, if the home-region is unavailable. (diff) | |
download | opensim-SC-74ba1bb18098325dc411dcbf2d30a6f727872e9f.zip opensim-SC-74ba1bb18098325dc411dcbf2d30a6f727872e9f.tar.gz opensim-SC-74ba1bb18098325dc411dcbf2d30a6f727872e9f.tar.bz2 opensim-SC-74ba1bb18098325dc411dcbf2d30a6f727872e9f.tar.xz |
Fix child prims in attachments chatting from near 0,0,0 rather than
the avatar position. Fixes "silent" child prim scripts
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index acec921..06a7512 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -424,9 +424,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
424 | m_groupPosition.Y = PhysActor.Position.Y; | 424 | m_groupPosition.Y = PhysActor.Position.Y; |
425 | m_groupPosition.Z = PhysActor.Position.Z; | 425 | m_groupPosition.Z = PhysActor.Position.Z; |
426 | } | 426 | } |
427 | if (IsAttachment) | 427 | if (ParentGroup.RootPart.IsAttachment) |
428 | { | 428 | { |
429 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(AttachedAvatar); | 429 | ScenePresence sp = m_parentGroup.Scene.GetScenePresence(ParentGroup.RootPart.AttachedAvatar); |
430 | if (sp != null) | 430 | if (sp != null) |
431 | { | 431 | { |
432 | return sp.AbsolutePosition; | 432 | return sp.AbsolutePosition; |
@@ -743,7 +743,7 @@ if (m_shape != null) { | |||
743 | public Vector3 AbsolutePosition | 743 | public Vector3 AbsolutePosition |
744 | { | 744 | { |
745 | get { | 745 | get { |
746 | if (IsAttachment) | 746 | if (ParentGroup.RootPart.IsAttachment) |
747 | return GroupPosition; | 747 | return GroupPosition; |
748 | 748 | ||
749 | return m_offsetPosition + m_groupPosition; } | 749 | return m_offsetPosition + m_groupPosition; } |