diff options
| author | BlueWall | 2011-11-23 10:50:29 -0500 |
|---|---|---|
| committer | BlueWall | 2011-11-23 10:50:29 -0500 |
| commit | 0738fc43e46bd12343c4e43ea19affe65514521a (patch) | |
| tree | 607b0dcb20f1f05675a00af00ab94fe2f86c5a1e /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
| parent | Shell Environment Variables in config (diff) | |
| parent | Log error if we attempt to add/remove an OdeCharacter from the _characters li... (diff) | |
| download | opensim-SC_OLD-0738fc43e46bd12343c4e43ea19affe65514521a.zip opensim-SC_OLD-0738fc43e46bd12343c4e43ea19affe65514521a.tar.gz opensim-SC_OLD-0738fc43e46bd12343c4e43ea19affe65514521a.tar.bz2 opensim-SC_OLD-0738fc43e46bd12343c4e43ea19affe65514521a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index eaa1175..7ab295a 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -221,15 +221,9 @@ namespace OpenSim.Region.Physics.Manager | |||
| 221 | return false; | 221 | return false; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) | 224 | public virtual void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents) {} |
| 225 | { | ||
| 226 | return; | ||
| 227 | } | ||
| 228 | 225 | ||
| 229 | public virtual void UnCombine(PhysicsScene pScene) | 226 | public virtual void UnCombine(PhysicsScene pScene) {} |
| 230 | { | ||
| 231 | |||
| 232 | } | ||
| 233 | 227 | ||
| 234 | /// <summary> | 228 | /// <summary> |
| 235 | /// Queue a raycast against the physics scene. | 229 | /// Queue a raycast against the physics scene. |