diff options
| author | Melanie | 2014-01-05 20:12:32 +0000 |
|---|---|---|
| committer | Melanie | 2014-01-05 20:12:32 +0000 |
| commit | e79fab91dbe731e9d177de61993d963bcc067299 (patch) | |
| tree | 4358fd508e55dd91774ba83b8e4c30fc24f452c7 /prebuild.xml | |
| parent | Merge commit '92aad6f1bb45974927fa43d6fd30f98337dee3f0' into careminster (diff) | |
| parent | Some missing definitions needed for successful compilation. (diff) | |
| download | opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.zip opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.gz opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.bz2 opensim-SC_OLD-e79fab91dbe731e9d177de61993d963bcc067299.tar.xz | |
Intermediate commit. Sill errors.
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7ad1e44..8e2192b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2964,8 +2964,9 @@ | |||
| 2964 | <Reference name="OpenSim.Framework.Console"/> | 2964 | <Reference name="OpenSim.Framework.Console"/> |
| 2965 | <Reference name="OpenSim.Framework.Servers"/> | 2965 | <Reference name="OpenSim.Framework.Servers"/> |
| 2966 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2966 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 2967 | <Reference name="OpenSim.Region.Framework"/> | ||
| 2968 | <Reference name="OpenSim.Region.CoreModules"/> | 2967 | <Reference name="OpenSim.Region.CoreModules"/> |
| 2968 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | ||
| 2969 | <Reference name="OpenSim.Region.Framework"/> | ||
| 2969 | <Reference name="OpenSim.Region.OptionalModules"/> | 2970 | <Reference name="OpenSim.Region.OptionalModules"/> |
| 2970 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2971 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 2971 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2972 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
| @@ -3325,6 +3326,7 @@ | |||
| 3325 | <Reference name="System.Drawing"/> | 3326 | <Reference name="System.Drawing"/> |
| 3326 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 3327 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 3327 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 3328 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 3329 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 3328 | <Reference name="OpenSim.Data"/> | 3330 | <Reference name="OpenSim.Data"/> |
| 3329 | <Reference name="OpenSim.Framework"/> | 3331 | <Reference name="OpenSim.Framework"/> |
| 3330 | <Reference name="OpenSim.Framework.Serialization"/> | 3332 | <Reference name="OpenSim.Framework.Serialization"/> |
| @@ -3333,6 +3335,7 @@ | |||
| 3333 | <Reference name="OpenSim.Framework.Monitoring"/> | 3335 | <Reference name="OpenSim.Framework.Monitoring"/> |
| 3334 | <Reference name="OpenSim.Framework.Servers"/> | 3336 | <Reference name="OpenSim.Framework.Servers"/> |
| 3335 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3337 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3338 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | ||
| 3336 | <Reference name="OpenSim.Region.Framework"/> | 3339 | <Reference name="OpenSim.Region.Framework"/> |
| 3337 | <Reference name="OpenSim.Region.Framework.Interfaces"/> | 3340 | <Reference name="OpenSim.Region.Framework.Interfaces"/> |
| 3338 | <Reference name="OpenSim.Region.CoreModules"/> | 3341 | <Reference name="OpenSim.Region.CoreModules"/> |