diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c1fe6a3..f1e781c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -2059,7 +2059,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2059 | else | 2059 | else |
2060 | m_log.WarnFormat( | 2060 | m_log.WarnFormat( |
2061 | "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", | 2061 | "[SCENE OBJECT PART]: Part {0} {1} requested mesh/sculpt data for asset id {2} from asset service but received no data", |
2062 | Name, LocalId, id); | 2062 | Name, UUID, id); |
2063 | } | 2063 | } |
2064 | 2064 | ||
2065 | /// <summary> | 2065 | /// <summary> |
@@ -5026,8 +5026,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5026 | if (ParentGroup.IsDeleted) | 5026 | if (ParentGroup.IsDeleted) |
5027 | return; | 5027 | return; |
5028 | 5028 | ||
5029 | if (ParentGroup.IsAttachment && ((ParentGroup.RootPart != this) || | 5029 | if (ParentGroup.IsAttachment |
5030 | ((ParentGroup.AttachedAvatar != remoteClient.AgentId) && (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38)))) | 5030 | && (ParentGroup.RootPart != this |
5031 | || ParentGroup.AttachedAvatar != remoteClient.AgentId && ParentGroup.HasPrivateAttachmentPoint)) | ||
5031 | return; | 5032 | return; |
5032 | 5033 | ||
5033 | // Causes this thread to dig into the Client Thread Data. | 5034 | // Causes this thread to dig into the Client Thread Data. |