diff options
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 |