diff options
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Prioritizer.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 2a76755..33407ec 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
| @@ -122,7 +122,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 122 | if (entity is SceneObjectPart) | 122 | if (entity is SceneObjectPart) |
| 123 | { | 123 | { |
| 124 | SceneObjectPart sop = (SceneObjectPart)entity; | 124 | SceneObjectPart sop = (SceneObjectPart)entity; |
| 125 | if (sop.ParentGroup.RootPart.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) | 125 | if (sop.ParentGroup.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) |
| 126 | return 1; | 126 | return 1; |
| 127 | } | 127 | } |
| 128 | 128 | ||
| @@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 135 | if (entity is SceneObjectPart) | 135 | if (entity is SceneObjectPart) |
| 136 | { | 136 | { |
| 137 | SceneObjectPart sop = (SceneObjectPart)entity; | 137 | SceneObjectPart sop = (SceneObjectPart)entity; |
| 138 | if (sop.ParentGroup.RootPart.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) | 138 | if (sop.ParentGroup.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) |
| 139 | return 1; | 139 | return 1; |
| 140 | } | 140 | } |
| 141 | 141 | ||
| @@ -148,7 +148,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 148 | if (entity is SceneObjectPart) | 148 | if (entity is SceneObjectPart) |
| 149 | { | 149 | { |
| 150 | SceneObjectPart sop = (SceneObjectPart)entity; | 150 | SceneObjectPart sop = (SceneObjectPart)entity; |
| 151 | if (sop.ParentGroup.RootPart.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) | 151 | if (sop.ParentGroup.IsAttachment && client.AgentId == sop.ParentGroup.AttachedAvatar) |
| 152 | return 1; | 152 | return 1; |
| 153 | } | 153 | } |
| 154 | 154 | ||
| @@ -171,7 +171,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 171 | if (entity is SceneObjectPart) | 171 | if (entity is SceneObjectPart) |
| 172 | { | 172 | { |
| 173 | // Attachments are high priority, | 173 | // Attachments are high priority, |
| 174 | if (((SceneObjectPart)entity).ParentGroup.RootPart.IsAttachment) | 174 | if (((SceneObjectPart)entity).ParentGroup.IsAttachment) |
| 175 | return 1; | 175 | return 1; |
| 176 | 176 | ||
| 177 | // Non physical prims are lower priority than physical prims | 177 | // Non physical prims are lower priority than physical prims |