Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 3 insertions, 7 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 54caac4..866ba9a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,8 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Physics.Manager;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;

+using OpenSim.Services.Base;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.UserAccountService;
 
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
deleted file mode 100755
index 026417a..0000000
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<configuration>
-  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
-  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
-  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" />
-</configuration>
diff --git a/prebuild.xml b/prebuild.xml
index 91308a4..3aca02d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1840,6 +1840,7 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Services.Base"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Services.UserAccountService"/>
       <Reference name="XMLRPC" path="../../../bin/"/>