diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 2e6b104..c984824 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -165,6 +165,9 @@ public abstract class BSLinkset | |||
165 | bool ret = false; | 165 | bool ret = false; |
166 | lock (m_linksetActivityLock) | 166 | lock (m_linksetActivityLock) |
167 | { | 167 | { |
168 | if (m_children.Contains(child)) | ||
169 | ret = true; | ||
170 | /* | ||
168 | foreach (BSPhysObject bp in m_children) | 171 | foreach (BSPhysObject bp in m_children) |
169 | { | 172 | { |
170 | if (child.LocalID == bp.LocalID) | 173 | if (child.LocalID == bp.LocalID) |
@@ -173,6 +176,7 @@ public abstract class BSLinkset | |||
173 | break; | 176 | break; |
174 | } | 177 | } |
175 | } | 178 | } |
179 | */ | ||
176 | } | 180 | } |
177 | return ret; | 181 | return ret; |
178 | } | 182 | } |
@@ -196,21 +200,20 @@ public abstract class BSLinkset | |||
196 | // Called at taint-time! | 200 | // Called at taint-time! |
197 | public abstract bool MakeStatic(BSPhysObject child); | 201 | public abstract bool MakeStatic(BSPhysObject child); |
198 | 202 | ||
199 | // If the software is handling the movement of all the objects in a linkset | 203 | // Called when a parameter update comes from the physics engine for any object |
200 | // (like if one doesn't use constraints for static linksets), this is called | 204 | // of the linkset is received. |
201 | // when an update for the root of the linkset is received. | ||
202 | // Called at taint-time!! | 205 | // Called at taint-time!! |
203 | public abstract void UpdateProperties(BSPhysObject physObject); | 206 | public abstract void UpdateProperties(BSPhysObject physObject); |
204 | 207 | ||
205 | // Routine used when rebuilding the body of the root of the linkset | 208 | // Routine used when rebuilding the body of the root of the linkset |
206 | // Destroy all the constraints have have been made to root. | 209 | // Destroy all the constraints have have been made to root. |
207 | // This is called when the root body is changing. | 210 | // This is called when the root body is changing. |
208 | // Returns 'true' of something eas actually removed and would need restoring | 211 | // Returns 'true' of something was actually removed and would need restoring |
209 | // Called at taint-time!! | 212 | // Called at taint-time!! |
210 | public abstract bool RemoveBodyDependencies(BSPrim child); | 213 | public abstract bool RemoveBodyDependencies(BSPrim child); |
211 | 214 | ||
212 | // Companion to RemoveBodyDependencies(). If RemoveBodyDependencies() returns 'true', | 215 | // Companion to RemoveBodyDependencies(). If RemoveBodyDependencies() returns 'true', |
213 | // this routine will restore the removed constraints. | 216 | // this routine will restore the removed constraints. |
214 | // Called at taint-time!! | 217 | // Called at taint-time!! |
215 | public abstract void RestoreBodyDependencies(BSPrim child); | 218 | public abstract void RestoreBodyDependencies(BSPrim child); |
216 | 219 | ||