aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorubit2012-10-04 00:18:57 +0200
committerubit2012-10-04 00:18:57 +0200
commit57bfd38e2a86895abf8132eb7af49ee7a20a12d6 (patch)
treea7de3eab7e899f974f0e20268e0ece9491ba002a
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent missing changed file (diff)
downloadopensim-SC-57bfd38e2a86895abf8132eb7af49ee7a20a12d6.zip
opensim-SC-57bfd38e2a86895abf8132eb7af49ee7a20a12d6.tar.gz
opensim-SC-57bfd38e2a86895abf8132eb7af49ee7a20a12d6.tar.bz2
opensim-SC-57bfd38e2a86895abf8132eb7af49ee7a20a12d6.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs2
1 files changed, 1 insertions, 1 deletions
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
106 get { return new NullPhysicsScene(); } 106 get { return new NullPhysicsScene(); }
107 } 107 }
108 108
109 public RequestAssetDelegate RequestAssetMethod { private get; set; } 109 public RequestAssetDelegate RequestAssetMethod { get; set; }
110 110
111 public virtual void TriggerPhysicsBasedRestart() 111 public virtual void TriggerPhysicsBasedRestart()
112 { 112 {