From a9f2bc150f8177e9e6340b7591b2f846f0678329 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 3 Oct 2012 23:18:35 +0100
Subject:  missing changed file

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 5274f3b..46bfa59 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Physics.Manager
             get { return new NullPhysicsScene(); }
         }
 
-        public RequestAssetDelegate RequestAssetMethod { private get; set; }
+        public RequestAssetDelegate RequestAssetMethod { get; set; }
 
         public virtual void TriggerPhysicsBasedRestart()
         {
-- 
cgit v1.1


From 3bf7201fd4d3e2b240f8139c20f88c916d338c31 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 9 Oct 2012 00:18:39 +0100
Subject: move terrain geom to own ode space. Limit range on raycast if
 includes terrain until ode doesn't eat all stack. Add a pre-simulation method
 to do pending actors changes (except mesh assets still not ready to use), to
 be optionaly called before firing heartbeat. [UNTESTED]

---
 OpenSim/Region/Physics/Manager/PhysicsScene.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')

diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 46bfa59..ce269fa 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -246,6 +246,9 @@ namespace OpenSim.Region.Physics.Manager
 
         public abstract void AddPhysicsActorTaint(PhysicsActor prim);
 
+
+        public virtual void PrepareSimulation() { }
+
         /// <summary>
         /// Perform a simulation of the current physics scene over the given timestep.
         /// </summary>
-- 
cgit v1.1