diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 9301e52..c293e8c 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -60,27 +60,7 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
60 | { | 60 | { |
61 | // A linkset is incomplete when base objects are incomplete, waiting for assets, | 61 | // A linkset is incomplete when base objects are incomplete, waiting for assets, |
62 | // or being rebuilt. | 62 | // or being rebuilt. |
63 | bool ret = false; | 63 | return (base.IsIncomplete || Linkset.RebuildScheduled || !Linkset.AllPartsComplete); |
64 | if (base.IsIncomplete || Linkset.RebuildScheduled) | ||
65 | { | ||
66 | ret = true; | ||
67 | } | ||
68 | else | ||
69 | { | ||
70 | if (Linkset.IsRoot(this)) | ||
71 | { | ||
72 | Linkset.ForEachMember((member) => | ||
73 | { | ||
74 | if (member.PrimAssetState == PrimAssetCondition.Waiting) | ||
75 | { | ||
76 | ret = true; | ||
77 | return true; | ||
78 | } | ||
79 | return false; | ||
80 | }); | ||
81 | } | ||
82 | } | ||
83 | return ret; | ||
84 | } | 64 | } |
85 | } | 65 | } |
86 | 66 | ||