diff --git a/OpenSim/Region/Capabilities/Caps.cs b/OpenSim/Region/Capabilities/Caps.cs
index d2ef52686a..110ba6f2f7 100644
--- a/OpenSim/Region/Capabilities/Caps.cs
+++ b/OpenSim/Region/Capabilities/Caps.cs
@@ -77,9 +77,7 @@ namespace OpenSim.Region.Capabilities
             httpListener.AddStreamHandler(new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", capsBase + m_mapLayerPath, this.GetMapLayer ));
             httpListener.AddStreamHandler( new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", capsBase + m_newInventory, this.NewAgentInventoryRequest));
 
-            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);                       
-          //  AddLegacyCapsHandler( httpListener, eventQueue, ProcessEventQueue);
-         //  AddLegacyCapsHandler( httpListener, m_requestTexture, RequestTexture);
+            AddLegacyCapsHandler(httpListener, m_requestPath, CapsRequest);           
         }
 
         [Obsolete("Use BaseHttpServer.AddStreamHandler(new LLSDStreamHandler( LLSDMethod delegate )) instead.")]
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 926f1a4982..9e8135ff3c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -51,6 +51,22 @@ namespace OpenSim.Region.Environment.Scenes
 
         public bool isSelected = false;
 
+        public PhysicsScene PhysScene
+        {
+            get
+            {
+                return m_PhysScene;
+            }
+        }
+
+        public PhysicsActor PhysActor
+        {
+            get
+            {
+                return m_PhysActor;
+            }
+        }
+
         public LLUUID rootUUID
         {
             get
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 2c2c8dd7d6..d0faf02a6e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -35,9 +35,11 @@ namespace OpenSim.Physics.Manager
 
     public abstract class PhysicsActor
     {
+#pragma warning disable 67
         public event PositionUpdate OnPositionUpdate;
         public event VelocityUpdate OnVelocityUpdate;
         public event OrientationUpdate OnOrientationUpdate;
+#pragma warning restore 67
 
         public static PhysicsActor Null
         {