diff options
| author | Melanie | 2011-04-17 18:48:53 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-17 18:48:53 +0100 |
| commit | 474910c9d624b53c010232ddb32b4002f58f1de0 (patch) | |
| tree | 45ddab37c6afa0b095ffa0503640b9fe235bc400 /prebuild.xml | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | More descriptive debug msg for ServiceOSDRequest failures. (diff) | |
| download | opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.zip opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.gz opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.bz2 opensim-SC_OLD-474910c9d624b53c010232ddb32b4002f58f1de0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index ff08558..16b5bfa 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -961,7 +961,6 @@ | |||
| 961 | <Reference name="OpenSim.Framework"/> | 961 | <Reference name="OpenSim.Framework"/> |
| 962 | <Reference name="OpenSim.Framework.Communications"/> | 962 | <Reference name="OpenSim.Framework.Communications"/> |
| 963 | <Reference name="OpenSim.Framework.Console"/> | 963 | <Reference name="OpenSim.Framework.Console"/> |
| 964 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
| 965 | <Reference name="OpenSim.Region.Framework"/> | 964 | <Reference name="OpenSim.Region.Framework"/> |
| 966 | <Reference name="OpenSim.Server.Base"/> | 965 | <Reference name="OpenSim.Server.Base"/> |
| 967 | <Reference name="OpenSim.Services.Base"/> | 966 | <Reference name="OpenSim.Services.Base"/> |
| @@ -2921,6 +2920,7 @@ | |||
| 2921 | <!-- SADLY the way this works means you need to keep adding these paths --> | 2920 | <!-- SADLY the way this works means you need to keep adding these paths --> |
| 2922 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> | 2921 | <Match path="Agent/TextureSender/Tests" pattern="*.cs" recurse="true"/> |
| 2923 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2922 | <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 2923 | <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> | ||
| 2924 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> | 2924 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> |
| 2925 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> | 2925 | <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/> |
| 2926 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> | 2926 | <Match path="World/Land/Tests" pattern="*.cs" recurse="true"/> |