diff options
| author | Melanie | 2012-02-18 22:21:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-18 22:21:10 +0000 |
| commit | 985526b662f47404404281a3ef4a35afa607bfbf (patch) | |
| tree | cbda3c3003b6f456498f0ee3ec6edfc10b5fd64a /OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.zip opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.gz opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.bz2 opensim-SC_OLD-985526b662f47404404281a3ef4a35afa607bfbf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs')
| -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 | { |