diff options
| author | Melanie | 2012-02-10 10:20:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-10 10:20:51 +0000 |
| commit | 215acbcc9667077fc665be6d5f81c66cf989891e (patch) | |
| tree | 291a607c6fd648b3488d6cc8f05a84ff4f134446 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff) | |
| download | opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.zip opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.gz opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.bz2 opensim-SC-215acbcc9667077fc665be6d5f81c66cf989891e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 0454e24..77cae6e 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3316,12 +3316,16 @@ | |||
| 3316 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 3316 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 3317 | <Reference name="XMLRPC" path="../../../bin/"/> | 3317 | <Reference name="XMLRPC" path="../../../bin/"/> |
| 3318 | <Reference name="OpenSim.Framework"/> | 3318 | <Reference name="OpenSim.Framework"/> |
| 3319 | <Reference name="OpenSim.Framework.Communications"/> | ||
| 3319 | <Reference name="OpenSim.Framework.Console"/> | 3320 | <Reference name="OpenSim.Framework.Console"/> |
| 3320 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3321 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3321 | <Reference name="OpenSim.Region.CoreModules"/> | 3322 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3322 | <Reference name="OpenSim.Region.Framework"/> | 3323 | <Reference name="OpenSim.Region.Framework"/> |
| 3324 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
| 3323 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 3325 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
| 3324 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | 3326 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> |
| 3327 | <Reference name="OpenSim.Services.Interfaces"/> | ||
| 3328 | <Reference name="OpenSim.Services.AvatarService"/> | ||
| 3325 | <Reference name="OpenSim.Tests.Common"/> | 3329 | <Reference name="OpenSim.Tests.Common"/> |
| 3326 | <Files> | 3330 | <Files> |
| 3327 | <Match pattern="*.cs" recurse="false"/> | 3331 | <Match pattern="*.cs" recurse="false"/> |