diff options
| author | Melanie | 2012-10-12 19:05:06 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-12 19:05:06 +0100 |
| commit | 6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4 (patch) | |
| tree | d81136f8cc2c602d5cc6b783e5cb3d23343a089e /prebuild.xml | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | BulletSim: only use native sphere shape if it is a sphere. (diff) | |
| download | opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.zip opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.gz opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.bz2 opensim-SC_OLD-6ce93b22d1bc0f2a89c0d7a8d79bfe8c85a2d9b4.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/prebuild.xml b/prebuild.xml index eae85bb..08e7070 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -112,6 +112,34 @@ | |||
| 112 | </Files> | 112 | </Files> |
| 113 | </Project> | 113 | </Project> |
| 114 | 114 | ||
| 115 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> | ||
| 116 | <Configuration name="Debug"> | ||
| 117 | <Options> | ||
| 118 | <OutputPath>../../../bin/</OutputPath> | ||
| 119 | </Options> | ||
| 120 | </Configuration> | ||
| 121 | <Configuration name="Release"> | ||
| 122 | <Options> | ||
| 123 | <OutputPath>../../../bin/</OutputPath> | ||
| 124 | </Options> | ||
| 125 | </Configuration> | ||
| 126 | |||
| 127 | <ReferencePath>../../../bin/</ReferencePath> | ||
| 128 | <Reference name="System"/> | ||
| 129 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
| 130 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
| 131 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 132 | <Reference name="OpenSim.Framework"/> | ||
| 133 | <Reference name="OpenSim.Framework.Console"/> | ||
| 134 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 135 | <Reference name="Nini" path="../../../bin/"/> | ||
| 136 | <Reference name="log4net" path="../../../bin/"/> | ||
| 137 | |||
| 138 | <Files> | ||
| 139 | <Match pattern="*.cs" recurse="true"/> | ||
| 140 | </Files> | ||
| 141 | </Project> | ||
| 142 | |||
| 115 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> | 143 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> |
| 116 | <Configuration name="Debug"> | 144 | <Configuration name="Debug"> |
| 117 | <Options> | 145 | <Options> |
| @@ -206,34 +234,6 @@ | |||
| 206 | </Files> | 234 | </Files> |
| 207 | </Project> | 235 | </Project> |
| 208 | 236 | ||
| 209 | <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library"> | ||
| 210 | <Configuration name="Debug"> | ||
| 211 | <Options> | ||
| 212 | <OutputPath>../../../bin/</OutputPath> | ||
| 213 | </Options> | ||
| 214 | </Configuration> | ||
| 215 | <Configuration name="Release"> | ||
| 216 | <Options> | ||
| 217 | <OutputPath>../../../bin/</OutputPath> | ||
| 218 | </Options> | ||
| 219 | </Configuration> | ||
| 220 | |||
| 221 | <ReferencePath>../../../bin/</ReferencePath> | ||
| 222 | <Reference name="System"/> | ||
| 223 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
| 224 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
| 225 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 226 | <Reference name="OpenSim.Framework"/> | ||
| 227 | <Reference name="OpenSim.Framework.Console"/> | ||
| 228 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 229 | <Reference name="Nini" path="../../../bin/"/> | ||
| 230 | <Reference name="log4net" path="../../../bin/"/> | ||
| 231 | |||
| 232 | <Files> | ||
| 233 | <Match pattern="*.cs" recurse="true"/> | ||
| 234 | </Files> | ||
| 235 | </Project> | ||
| 236 | |||
| 237 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> | 237 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> |
| 238 | <Configuration name="Debug"> | 238 | <Configuration name="Debug"> |
| 239 | <Options> | 239 | <Options> |