diff options
author | Melanie | 2012-02-19 14:20:53 +0100 |
---|---|---|
committer | Melanie | 2012-02-19 14:20:53 +0100 |
commit | 185bf55804af69390f54650f238d126614062e87 (patch) | |
tree | 3371a66f758745ae0694f8199054c3fa3d8548e6 /OpenSim/Region/Physics/Manager | |
parent | Now if chode prim.cs detects out of bounds it requests a update and blocks mo... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.zip opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.gz opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.bz2 opensim-SC_OLD-185bf55804af69390f54650f238d126614062e87.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 3763696..8587a2b 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
@@ -30,7 +30,8 @@ using System.Collections.Generic; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | ||
34 | 35 | ||
35 | namespace OpenSim.Region.Physics.Manager | 36 | namespace OpenSim.Region.Physics.Manager |
36 | { | 37 | { |