From 07b0e2df6fadf6b2ce720a13d555028f03f73fe8 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 13 Jul 2007 17:52:11 +0000
Subject: 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.

---
 OpenSim/Region/Environment/Scenes/Primitive.cs | 2 +-
 OpenSim/Region/Environment/Scenes/Scene.cs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Environment')

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);
-- 
cgit v1.1