Part two of Darok's Bullet physics plugin: added the actual plugin, although haven't added the project to prebuild.xml yet.

Also might have messed up some of the SVN properties on some of the folders, so if the cleaning lady has to come in again, I just hope she doesn't moan. 

2 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs
index 53314e3..ab50373 100644
--- a/OpenSim/Region/Environment/Scenes/Primitive.cs
+++ b/OpenSim/Region/Environment/Scenes/Primitive.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Scenes
             dupe.Rotation = new Quaternion(this.Rotation.w, this.Rotation.x, this.Rotation.y, this.Rotation.z);

             dupe.Pos = new LLVector3(this.Pos.X, this.Pos.Y, this.Pos.Z);

             rootParent.AddChildToList(dupe);

-

+            

             foreach (Primitive prim in this.children)

             {

                 Primitive primClone = prim.Copy(this, rootParent);

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index c8714ae..0305b50 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Scenes
             

         }

 

-        protected override void SubscribeToClientEvents(IClientAPI client)

+        protected virtual void SubscribeToClientEvents(IClientAPI client)

         {

             client.OnRegionHandShakeReply += this.SendLayerData;

             //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);