Revert "BulletSim: delay adding a scene presence to the list of presences"

Remove these changes until the region crossing problems can be figured out.

This reverts commit 062ec0efbda0e4ca6df5541039569e023d0d0e79.

1 files changed, 13 insertions, 14 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 2a8a6a5..8a19944 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -477,19 +477,16 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         if (!m_initialized) return null;
 
-        BSCharacter actor = new BSCharacter(localID, avName, this, position, velocity, size, isFlying,
-            (aa) =>
-            {
-                // While the actor exists, don't add it to the active avatar lists until completely initialized
-                lock (PhysObjects)
-                    PhysObjects.Add(localID, aa);
+        BSCharacter actor = new BSCharacter(localID, avName, this, position, velocity, size, isFlying);
+        lock (PhysObjects)
+            PhysObjects.Add(localID, actor);
+
+        // TODO: Remove kludge someday.
+        // We must generate a collision for avatars whether they collide or not.
+        // This is required by OpenSim to update avatar animations, etc.
+        lock (AvatarsInSceneLock)
+            AvatarsInScene.Add(actor);
 
-                // TODO: Remove kludge someday.
-                // We must generate a collision for avatars whether they collide or not.
-                // This is required by OpenSim to update avatar animations, etc.
-                lock (AvatarsInSceneLock)
-                    AvatarsInScene.Add(aa);
-            });
         return actor;
     }
 
@@ -833,8 +830,10 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
             {
                 // If a collision was 'good', remember to send it to the simulator
-                // Note that 'CollisionLock' was locked before the call to 'SendCollsions'
-                ObjectsWithCollisions.Add(collider);
+                lock (CollisionLock)
+                {
+                    ObjectsWithCollisions.Add(collider);
+                }
             }
         }