diff options
| author | Diva Canto | 2014-07-03 20:09:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-07-03 20:09:38 -0700 |
| commit | d0782c2bc0f4d4f644188deec7638efaf8e81514 (patch) | |
| tree | 3788483ff89a3134b98726d9cb782814aca9efc0 /prebuild.xml | |
| parent | Avoid an exception in creating child agents some times. (diff) | |
| parent | Temporarily disable new regression test TestLifecycle() until I have a chance... (diff) | |
| download | opensim-SC-d0782c2bc0f4d4f644188deec7638efaf8e81514.zip opensim-SC-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.gz opensim-SC-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.bz2 opensim-SC-d0782c2bc0f4d4f644188deec7638efaf8e81514.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 0143e26..e2423ae 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3185,8 +3185,11 @@ | |||
| 3185 | <Reference name="System.Xml"/> | 3185 | <Reference name="System.Xml"/> |
| 3186 | <Reference name="System.Drawing"/> | 3186 | <Reference name="System.Drawing"/> |
| 3187 | <Reference name="System.Runtime.Remoting"/> | 3187 | <Reference name="System.Runtime.Remoting"/> |
| 3188 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 3188 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3189 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 3189 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 3190 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 3191 | <Reference name="OpenSim"/> | ||
| 3192 | <Reference name="OpenSim.ApplicationPlugins.RegionModulesController"/> | ||
| 3190 | <Reference name="OpenSim.Capabilities"/> | 3193 | <Reference name="OpenSim.Capabilities"/> |
| 3191 | <Reference name="OpenSim.Data"/> | 3194 | <Reference name="OpenSim.Data"/> |
| 3192 | <Reference name="OpenSim.Framework"/> | 3195 | <Reference name="OpenSim.Framework"/> |
| @@ -3195,6 +3198,7 @@ | |||
| 3195 | <Reference name="OpenSim.Framework.Monitoring"/> | 3198 | <Reference name="OpenSim.Framework.Monitoring"/> |
| 3196 | <Reference name="OpenSim.Framework.Servers"/> | 3199 | <Reference name="OpenSim.Framework.Servers"/> |
| 3197 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3200 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3201 | <Reference name="OpenSim.Region.ClientStack"/> | ||
| 3198 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | 3202 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> |
| 3199 | <Reference name="OpenSim.Region.Framework"/> | 3203 | <Reference name="OpenSim.Region.Framework"/> |
| 3200 | <Reference name="OpenSim.Region.CoreModules"/> | 3204 | <Reference name="OpenSim.Region.CoreModules"/> |