diff options
| author | Melanie | 2013-01-23 02:38:59 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-23 02:38:59 +0000 |
| commit | cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad (patch) | |
| tree | 0854a68c0329c37b9eedea56b3bf65458c59b696 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: Tweeks to vehicle motion. (diff) | |
| download | opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.zip opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.gz opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.bz2 opensim-SC_OLD-cc4cfd9fa81fa8e7c7254bd3c35e67ef9cb20dad.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/prebuild.xml b/prebuild.xml index f1964f3..0f3b55c 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1850,45 +1850,13 @@ | |||
| 1850 | <Configuration name="Debug"> | 1850 | <Configuration name="Debug"> |
| 1851 | <Options> | 1851 | <Options> |
| 1852 | <OutputPath>../../../../bin/Physics/</OutputPath> | 1852 | <OutputPath>../../../../bin/Physics/</OutputPath> |
| 1853 | <AllowUnsafe>true</AllowUnsafe> | ||
| 1853 | </Options> | 1854 | </Options> |
| 1854 | </Configuration> | 1855 | </Configuration> |
| 1855 | <Configuration name="Release"> | 1856 | <Configuration name="Release"> |
| 1856 | <Options> | 1857 | <Options> |
| 1857 | <OutputPath>../../../../bin/Physics/</OutputPath> | 1858 | <OutputPath>../../../../bin/Physics/</OutputPath> |
| 1858 | </Options> | 1859 | <AllowUnsafe>true</AllowUnsafe> |
| 1859 | </Configuration> | ||
| 1860 | |||
| 1861 | <ReferencePath>../../../../bin/</ReferencePath> | ||
| 1862 | <Reference name="System"/> | ||
| 1863 | <Reference name="System.Core"/> | ||
| 1864 | <Reference name="System.Xml"/> | ||
| 1865 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 1866 | <Reference name="Nini.dll" path="../../../../bin/"/> | ||
| 1867 | <Reference name="OpenSim.Framework"/> | ||
| 1868 | <Reference name="OpenSim.Region.Framework"/> | ||
| 1869 | <Reference name="OpenSim.Region.CoreModules"/> | ||
| 1870 | <Reference name="OpenSim.Framework.Console"/> | ||
| 1871 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 1872 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 1873 | <Reference name="BulletXNA.dll" path="../../../../bin/"/> | ||
| 1874 | <Reference name="log4net.dll" path="../../../../bin/"/> | ||
| 1875 | |||
| 1876 | <Files> | ||
| 1877 | <Match pattern="*.cs" recurse="true"> | ||
| 1878 | <Exclude name="Tests" pattern="Tests"/> | ||
| 1879 | </Match> | ||
| 1880 | </Files> | ||
| 1881 | </Project> | ||
| 1882 | |||
| 1883 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSNPlugin" path="OpenSim/Region/Physics/BulletSNPlugin" type="Library"> | ||
| 1884 | <Configuration name="Debug"> | ||
| 1885 | <Options> | ||
| 1886 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 1887 | </Options> | ||
| 1888 | </Configuration> | ||
| 1889 | <Configuration name="Release"> | ||
| 1890 | <Options> | ||
| 1891 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 1892 | </Options> | 1860 | </Options> |
| 1893 | </Configuration> | 1861 | </Configuration> |
| 1894 | 1862 | ||