diff options
| author | Melanie | 2013-02-27 18:05:04 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-27 18:05:04 +0000 |
| commit | 578174d21c82e7249016e31f0c63215e67f92f17 (patch) | |
| tree | c9c970d2ce4836dcf894922172d784d16cbc2837 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve description of GenerateMapTiles config option (diff) | |
| download | opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.zip opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.gz opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.bz2 opensim-SC_OLD-578174d21c82e7249016e31f0c63215e67f92f17.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 8296daa..cbaa454 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2321,7 +2321,6 @@ | |||
| 2321 | <ReferencePath>../../../../bin/</ReferencePath> | 2321 | <ReferencePath>../../../../bin/</ReferencePath> |
| 2322 | <Reference name="System"/> | 2322 | <Reference name="System"/> |
| 2323 | <Reference name="System.Data"/> | 2323 | <Reference name="System.Data"/> |
| 2324 | <Reference name="System.Net"/> | ||
| 2325 | <Reference name="System.Web"/> | 2324 | <Reference name="System.Web"/> |
| 2326 | <Reference name="System.Xml"/> | 2325 | <Reference name="System.Xml"/> |
| 2327 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 2326 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
| @@ -3517,6 +3516,8 @@ | |||
| 3517 | <Reference name="System.Xml"/> | 3516 | <Reference name="System.Xml"/> |
| 3518 | <Reference name="OpenSim.Framework"/> | 3517 | <Reference name="OpenSim.Framework"/> |
| 3519 | <Reference name="OpenSim.Framework.Communications"/> | 3518 | <Reference name="OpenSim.Framework.Communications"/> |
| 3519 | <Reference name="OpenSim.Framework.Servers"/> | ||
| 3520 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 3520 | <Reference name="OpenSim.Region.CoreModules"/> | 3521 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3521 | <Reference name="OpenSim.Region.Framework"/> | 3522 | <Reference name="OpenSim.Region.Framework"/> |
| 3522 | <Reference name="OpenSim.Region.OptionalModules"/> | 3523 | <Reference name="OpenSim.Region.OptionalModules"/> |