diff options
| author | Justin Clark-Casey (justincc) | 2013-01-01 23:27:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-01 23:27:10 +0000 |
| commit | e8a3cc701910130e1aafb2b757737517c1cd1627 (patch) | |
| tree | f1fd4ed9cf2b8e80ea43d2a8028837874f1b193c /OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |
| parent | Clarify that AllowLightShareFunctions setting is false, which is the default ... (diff) | |
| parent | BulletSim: remove unused unmanaged memory reference functions from BSAPITempl... (diff) | |
| download | opensim-SC_OLD-e8a3cc701910130e1aafb2b757737517c1cd1627.zip opensim-SC_OLD-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.gz opensim-SC_OLD-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.bz2 opensim-SC_OLD-e8a3cc701910130e1aafb2b757737517c1cd1627.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs index 8587a2b..8ccfda5 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |||
| @@ -30,7 +30,7 @@ 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 | using OpenSim.Framework; |
| 35 | 35 | ||
| 36 | namespace OpenSim.Region.Physics.Manager | 36 | namespace OpenSim.Region.Physics.Manager |