diff options
author | BlueWall | 2012-02-17 21:15:18 -0500 |
---|---|---|
committer | BlueWall | 2012-02-17 21:15:18 -0500 |
commit | fbccff49940725f325dd864c2c5c39ad4bdb63e1 (patch) | |
tree | d9f4457a8441ae381dd567a37d1ba9c02e16f809 /OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs | |
parent | Parcel sales support to SQLite (diff) | |
parent | Fix a bug where changing shape parameters of a child prim in a linkset would ... (diff) | |
download | opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.zip opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.gz opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.tar.bz2 opensim-SC_OLD-fbccff49940725f325dd864c2c5c39ad4bdb63e1.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 | 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 | { |