diff options
| author | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-18 23:32:40 +0100 |
| commit | 8aa43e72e53cf57047be979499b31c2a970b0324 (patch) | |
| tree | 3f467214f8e2d77b57d258a3bc3571cc8d2648ff /OpenSim/Region/Physics/Manager/PhysicsScene.cs | |
| parent | Add number of inventory items to information displayed via "show part" consol... (diff) | |
| parent | Remove extraneous calls to the now commented CheckSculptAndLoad (diff) | |
| download | opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.zip opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.tar.gz opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.tar.bz2 opensim-SC_OLD-8aa43e72e53cf57047be979499b31c2a970b0324.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 6a0558a..488900e 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -76,7 +76,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 76 | get { return new NullPhysicsScene(); } | 76 | get { return new NullPhysicsScene(); } |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | public RequestAssetDelegate RequestAssetMethod { private get; set; } | 79 | public RequestAssetDelegate RequestAssetMethod { get; set; } |
| 80 | 80 | ||
| 81 | public virtual void TriggerPhysicsBasedRestart() | 81 | public virtual void TriggerPhysicsBasedRestart() |
| 82 | { | 82 | { |