diff options
| author | Justin Clark-Casey (justincc) | 2011-09-16 21:06:09 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-16 21:06:09 +0100 |
| commit | c695e23dd9474e31b031e4d1f57b23aba386145a (patch) | |
| tree | d3d02b06ff9835cebcffc635d070b7fb94ebd467 | |
| parent | Updated some variables to be closer to the coding standards (and easier to un... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.zip opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.gz opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.bz2 opensim-SC_OLD-c695e23dd9474e31b031e4d1f57b23aba386145a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 3 | ||||
| -rwxr-xr-x | bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 | ||||
| -rw-r--r-- | prebuild.xml | 1 |
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; | |||
| 46 | using OpenSim.Region.Framework.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
| 47 | using OpenSim.Region.Framework.Scenes; | 47 | using OpenSim.Region.Framework.Scenes; |
| 48 | using OpenSim.Region.Physics.Manager; | 48 | using OpenSim.Region.Physics.Manager; |
| 49 | using OpenSim.Server.Base; | 49 | using OpenSim.Server.Base; |
| 50 | using OpenSim.Services.Base; | ||
| 50 | using OpenSim.Services.Interfaces; | 51 | using OpenSim.Services.Interfaces; |
| 51 | using OpenSim.Services.UserAccountService; | 52 | using OpenSim.Services.UserAccountService; |
| 52 | 53 | ||
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 @@ | |||
| 1 | <configuration> | ||
| 2 | <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" /> | ||
| 3 | <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" /> | ||
| 4 | <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" /> | ||
| 5 | <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" /> | ||
| 6 | </configuration> | ||
diff --git a/prebuild.xml b/prebuild.xml index 91308a4..3aca02d 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1840,6 +1840,7 @@ | |||
| 1840 | <Reference name="OpenSim.Region.ClientStack"/> | 1840 | <Reference name="OpenSim.Region.ClientStack"/> |
| 1841 | <Reference name="OpenSim.Framework.Communications"/> | 1841 | <Reference name="OpenSim.Framework.Communications"/> |
| 1842 | <Reference name="OpenSim.Server.Base"/> | 1842 | <Reference name="OpenSim.Server.Base"/> |
| 1843 | <Reference name="OpenSim.Services.Base"/> | ||
| 1843 | <Reference name="OpenSim.Services.Interfaces"/> | 1844 | <Reference name="OpenSim.Services.Interfaces"/> |
| 1844 | <Reference name="OpenSim.Services.UserAccountService"/> | 1845 | <Reference name="OpenSim.Services.UserAccountService"/> |
| 1845 | <Reference name="XMLRPC" path="../../../bin/"/> | 1846 | <Reference name="XMLRPC" path="../../../bin/"/> |