ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 09:25:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2013-01-26 01:56:23 +00:00
parent 0b8bf69470 5128ae7b86
commit e28c042dce
10 changed files with 523 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
prebuild.xml
View File

@@ -2866,12 +2866,13 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
@@ -3234,6 +3235,7 @@
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
<Reference name="OpenSim.Services.AvatarService"/>
<Reference name="OpenSim.Services.Interfaces"/>
@@ -3258,6 +3260,7 @@
<Files>
<!-- SADLY the way this works means you need to keep adding these paths -->
<Match path="Avatar/XmlRpcGroups/Tests" pattern="*.cs" recurse="true"/>
<Match path="Scripting/JsonStore/Tests" pattern="*.cs" recurse="true"/>
<Match path="World/NPC/Tests" pattern="*.cs" recurse="true"/>
</Files>
</Project>