diff options
author | Jeff Ames | 2010-03-01 11:59:22 +0900 |
---|---|---|
committer | Jeff Ames | 2010-03-01 11:59:22 +0900 |
commit | a5f78ac604a03df86f3097c903f49fa2afe73597 (patch) | |
tree | 8ff43eac4632eb685ebbf0735a5050f044d10710 | |
parent | fix bug where region settings loaded via an oar (water height, terrain textur... (diff) | |
download | opensim-SC_OLD-a5f78ac604a03df86f3097c903f49fa2afe73597.zip opensim-SC_OLD-a5f78ac604a03df86f3097c903f49fa2afe73597.tar.gz opensim-SC_OLD-a5f78ac604a03df86f3097c903f49fa2afe73597.tar.bz2 opensim-SC_OLD-a5f78ac604a03df86f3097c903f49fa2afe73597.tar.xz |
Formatting cleanup.
-rw-r--r-- | prebuild.xml | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/prebuild.xml b/prebuild.xml index 8761a15..6b25792 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -533,7 +533,7 @@ | |||
533 | <Reference name="OpenSim.Framework"/> | 533 | <Reference name="OpenSim.Framework"/> |
534 | <Reference name="OpenSim.Framework.Console"/> | 534 | <Reference name="OpenSim.Framework.Console"/> |
535 | <Reference name="OpenSim.Region.Physics.Manager"/> | 535 | <Reference name="OpenSim.Region.Physics.Manager"/> |
536 | <Reference name="Ode.NET.dll" /> | 536 | <Reference name="Ode.NET.dll" /> |
537 | <Reference name="log4net.dll"/> | 537 | <Reference name="log4net.dll"/> |
538 | 538 | ||
539 | <Files> | 539 | <Files> |
@@ -571,8 +571,6 @@ | |||
571 | </Files> | 571 | </Files> |
572 | </Project> | 572 | </Project> |
573 | 573 | ||
574 | |||
575 | |||
576 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> | 574 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> |
577 | <Configuration name="Debug"> | 575 | <Configuration name="Debug"> |
578 | <Options> | 576 | <Options> |
@@ -1288,7 +1286,7 @@ | |||
1288 | <Match pattern="*.cs" recurse="true"/> | 1286 | <Match pattern="*.cs" recurse="true"/> |
1289 | </Files> | 1287 | </Files> |
1290 | </Project> | 1288 | </Project> |
1291 | 1289 | ||
1292 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library"> | 1290 | <Project frameworkVersion="v3_5" name="OpenSim.Services.AuthorizationService" path="OpenSim/Services/AuthorizationService" type="Library"> |
1293 | <Configuration name="Debug"> | 1291 | <Configuration name="Debug"> |
1294 | <Options> | 1292 | <Options> |
@@ -1619,7 +1617,7 @@ | |||
1619 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1617 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1620 | 1618 | ||
1621 | <Reference name="GlynnTucker.Cache.dll"/> | 1619 | <Reference name="GlynnTucker.Cache.dll"/> |
1622 | 1620 | ||
1623 | <!-- For scripting in funny languages by default --> | 1621 | <!-- For scripting in funny languages by default --> |
1624 | <Reference name="Microsoft.JScript"/> | 1622 | <Reference name="Microsoft.JScript"/> |
1625 | <Reference name="XMLRPC.dll"/> | 1623 | <Reference name="XMLRPC.dll"/> |
@@ -1627,8 +1625,8 @@ | |||
1627 | <Reference name="Nini.dll" /> | 1625 | <Reference name="Nini.dll" /> |
1628 | <Reference name="log4net.dll"/> | 1626 | <Reference name="log4net.dll"/> |
1629 | <Reference name="DotNetOpenMail.dll"/> | 1627 | <Reference name="DotNetOpenMail.dll"/> |
1630 | 1628 | ||
1631 | <!-- To allow regions to have mono addins --> | 1629 | <!-- To allow regions to have mono addins --> |
1632 | <Reference name="Mono.Addins.dll" /> | 1630 | <Reference name="Mono.Addins.dll" /> |
1633 | 1631 | ||
1634 | <Files> | 1632 | <Files> |
@@ -1711,7 +1709,6 @@ | |||
1711 | <Reference name="log4net.dll"/> | 1709 | <Reference name="log4net.dll"/> |
1712 | <Reference name="DotNetOpenMail.dll"/> | 1710 | <Reference name="DotNetOpenMail.dll"/> |
1713 | 1711 | ||
1714 | |||
1715 | <Files> | 1712 | <Files> |
1716 | <Match pattern="*.cs" recurse="true"> | 1713 | <Match pattern="*.cs" recurse="true"> |
1717 | <Exclude name="Tests" pattern="Tests" /> | 1714 | <Exclude name="Tests" pattern="Tests" /> |
@@ -1720,8 +1717,7 @@ | |||
1720 | </Files> | 1717 | </Files> |
1721 | </Project> | 1718 | </Project> |
1722 | 1719 | ||
1723 | 1720 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | |
1724 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | ||
1725 | <Configuration name="Debug"> | 1721 | <Configuration name="Debug"> |
1726 | <Options> | 1722 | <Options> |
1727 | <OutputPath>../../../bin/</OutputPath> | 1723 | <OutputPath>../../../bin/</OutputPath> |
@@ -1749,8 +1745,8 @@ | |||
1749 | <Reference name="OpenSim.Region.CoreModules" /> | 1745 | <Reference name="OpenSim.Region.CoreModules" /> |
1750 | <Reference name="Nini.dll" /> | 1746 | <Reference name="Nini.dll" /> |
1751 | <Reference name="log4net.dll"/> | 1747 | <Reference name="log4net.dll"/> |
1752 | 1748 | ||
1753 | <!-- To allow regions to have mono addins --> | 1749 | <!-- To allow regions to have mono addins --> |
1754 | <Reference name="Mono.Addins.dll" /> | 1750 | <Reference name="Mono.Addins.dll" /> |
1755 | 1751 | ||
1756 | <Files> | 1752 | <Files> |
@@ -1759,9 +1755,6 @@ | |||
1759 | </Files> | 1755 | </Files> |
1760 | </Project> | 1756 | </Project> |
1761 | 1757 | ||
1762 | |||
1763 | |||
1764 | |||
1765 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library"> | 1758 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library"> |
1766 | <Configuration name="Debug"> | 1759 | <Configuration name="Debug"> |
1767 | <Options> | 1760 | <Options> |
@@ -2274,11 +2267,9 @@ | |||
2274 | <Match pattern="*.cs" recurse="true"/> | 2267 | <Match pattern="*.cs" recurse="true"/> |
2275 | </Files> | 2268 | </Files> |
2276 | </Project> | 2269 | </Project> |
2277 | 2270 | ||
2278 | 2271 | <!-- Client Stack Modules --> | |
2279 | <!-- Client Stack Modules --> | 2272 | |
2280 | |||
2281 | |||
2282 | <Project frameworkVersion="v3_5" name="OpenSim.Client.MXP" path="OpenSim/Client/MXP" type="Library"> | 2273 | <Project frameworkVersion="v3_5" name="OpenSim.Client.MXP" path="OpenSim/Client/MXP" type="Library"> |
2283 | <Configuration name="Debug"> | 2274 | <Configuration name="Debug"> |
2284 | <Options> | 2275 | <Options> |
@@ -2327,10 +2318,10 @@ | |||
2327 | <Reference name="OpenMetaverseTypes.dll"/> | 2318 | <Reference name="OpenMetaverseTypes.dll"/> |
2328 | <Reference name="OpenMetaverse.dll"/> | 2319 | <Reference name="OpenMetaverse.dll"/> |
2329 | <Reference name="System"/> | 2320 | <Reference name="System"/> |
2330 | <Reference name="System.Drawing"/> | 2321 | <Reference name="System.Drawing"/> |
2331 | <Reference name="OpenSim.Framework"/> | 2322 | <Reference name="OpenSim.Framework"/> |
2332 | <Reference name="OpenSim.Framework.Servers"/> | 2323 | <Reference name="OpenSim.Framework.Servers"/> |
2333 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2324 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2334 | <Reference name="OpenSim.Region.Framework"/> | 2325 | <Reference name="OpenSim.Region.Framework"/> |
2335 | <Reference name="OpenSim.Framework.Communications"/> | 2326 | <Reference name="OpenSim.Framework.Communications"/> |
2336 | <Reference name="OpenSim.Services.Interfaces"/> | 2327 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -2372,7 +2363,7 @@ | |||
2372 | <Match pattern="*.cs" recurse="true"/> | 2363 | <Match pattern="*.cs" recurse="true"/> |
2373 | </Files> | 2364 | </Files> |
2374 | </Project> | 2365 | </Project> |
2375 | 2366 | ||
2376 | <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library"> | 2367 | <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library"> |
2377 | <Configuration name="Debug"> | 2368 | <Configuration name="Debug"> |
2378 | <Options> | 2369 | <Options> |
@@ -3022,7 +3013,7 @@ | |||
3022 | <ReferencePath>../../../bin/</ReferencePath> | 3013 | <ReferencePath>../../../bin/</ReferencePath> |
3023 | <Reference name="System"/> | 3014 | <Reference name="System"/> |
3024 | <Reference name="System.Xml"/> | 3015 | <Reference name="System.Xml"/> |
3025 | <Reference name="System.Core"/> | 3016 | <Reference name="System.Core"/> |
3026 | <Reference name="System.Drawing"/> | 3017 | <Reference name="System.Drawing"/> |
3027 | <Reference name="System.Data"/> | 3018 | <Reference name="System.Data"/> |
3028 | <Reference name="OpenMetaverse.dll"/> | 3019 | <Reference name="OpenMetaverse.dll"/> |
@@ -3031,7 +3022,7 @@ | |||
3031 | <Reference name="OpenSim.Data"/> | 3022 | <Reference name="OpenSim.Data"/> |
3032 | <Reference name="OpenSim.Region.Framework"/> | 3023 | <Reference name="OpenSim.Region.Framework"/> |
3033 | <Reference name="OpenSim.Region.CoreModules"/> | 3024 | <Reference name="OpenSim.Region.CoreModules"/> |
3034 | <Reference name="OpenSim.Tests.Common"/> | 3025 | <Reference name="OpenSim.Tests.Common"/> |
3035 | <Reference name="log4net.dll"/> | 3026 | <Reference name="log4net.dll"/> |
3036 | <Reference name="Mono.Addins.dll" /> | 3027 | <Reference name="Mono.Addins.dll" /> |
3037 | <Reference name="nunit.framework.dll" /> | 3028 | <Reference name="nunit.framework.dll" /> |
@@ -3272,7 +3263,7 @@ | |||
3272 | <Reference name="OpenSim.Region.CoreModules"/> | 3263 | <Reference name="OpenSim.Region.CoreModules"/> |
3273 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3264 | <Reference name="OpenSim.Region.Physics.Manager"/> |
3274 | <Reference name="OpenSim.Services.Interfaces"/> | 3265 | <Reference name="OpenSim.Services.Interfaces"/> |
3275 | 3266 | ||
3276 | <!-- Unit tests --> | 3267 | <!-- Unit tests --> |
3277 | <Reference name="OpenSim.Tests.Common"/> | 3268 | <Reference name="OpenSim.Tests.Common"/> |
3278 | <Reference name="Nini.dll"/> | 3269 | <Reference name="Nini.dll"/> |
@@ -3532,9 +3523,3 @@ | |||
3532 | 3523 | ||
3533 | </Solution> | 3524 | </Solution> |
3534 | </Prebuild> | 3525 | </Prebuild> |
3535 | |||
3536 | |||
3537 | |||
3538 | |||
3539 | |||
3540 | |||