diff options
author | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-09-02 04:39:00 -0400 |
commit | 9505297fb109e800be5733066f05f53d97eafe84 (patch) | |
tree | 45d659121e21932434310499c2ccf2690231793d /OpenSim/Region/Physics/Manager | |
parent | Prevent the Viewer's threaded inventory retrieval causing a OOM and overload (diff) | |
download | opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.zip opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.gz opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.bz2 opensim-SC_OLD-9505297fb109e800be5733066f05f53d97eafe84.tar.xz |
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 5c46344..8a07f71 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -172,6 +172,11 @@ namespace OpenSim.Region.Physics.Manager | |||
172 | return; | 172 | return; |
173 | } | 173 | } |
174 | 174 | ||
175 | public virtual void UnCombine(PhysicsScene pScene) | ||
176 | { | ||
177 | |||
178 | } | ||
179 | |||
175 | /// <summary> | 180 | /// <summary> |
176 | /// Queue a raycast against the physics scene. | 181 | /// Queue a raycast against the physics scene. |
177 | /// The provided callback method will be called when the raycast is complete | 182 | /// The provided callback method will be called when the raycast is complete |