1 files changed, 14 insertions, 13 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 8a19944..2a8a6a5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -477,16 +477,19 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         if (!m_initialized) return null;
 
-        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);
+        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);
 
+                // 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;
     }
 
@@ -830,10 +833,8 @@ 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
-                lock (CollisionLock)
-                {
-                    ObjectsWithCollisions.Add(collider);
-                }
+                // Note that 'CollisionLock' was locked before the call to 'SendCollsions'
+                ObjectsWithCollisions.Add(collider);
             }
         }