ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2010-01-26 14:53:14 +00:00
parent d2e17f4ffb 72dd680dd3
commit b80ea00265
90 changed files with 2140 additions and 962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prebuild.xml
View File

@@ -2272,6 +2272,7 @@
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="Nini.dll" />
<Reference name="Mono.Addins" />
<Reference name="log4net.dll" />
<Files>
<Match pattern="*.cs" recurse="true"/>
@@ -2332,6 +2333,7 @@
<Reference name="log4net.dll"/>
<Reference name="protobuf-net"/>
<Reference name="MXP.dll"/>
<Reference name="Mono.Addins"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
</Files>
@@ -2842,6 +2844,7 @@
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="Mono.Data.SqliteClient"/>
<Reference name="Mono.Addins"/>
<!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
@@ -3301,6 +3304,7 @@
<Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true" />
<Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true" />
<Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" />
<Match path="World/Archiver/Tests/Resources" pattern="*" buildAction="EmbeddedResource"/>
<Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" />
<Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" />
<Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true" />