diff options
| author | Melanie | 2010-12-15 22:59:52 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-15 22:59:52 +0000 |
| commit | d457b4c4b19902c67c0653b6c0c0b11496591dcd (patch) | |
| tree | 188ad3f7743c1a775d5e7b87459b9658e05c7c9d /prebuild.xml | |
| parent | Make sure the material is set on physical prims (diff) | |
| parent | Put in locks on m_killRecord to replace changed locks on m_entityUpdates.Sync... (diff) | |
| download | opensim-SC-d457b4c4b19902c67c0653b6c0c0b11496591dcd.zip opensim-SC-d457b4c4b19902c67c0653b6c0c0b11496591dcd.tar.gz opensim-SC-d457b4c4b19902c67c0653b6c0c0b11496591dcd.tar.bz2 opensim-SC-d457b4c4b19902c67c0653b6c0c0b11496591dcd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7dd7b67..380e98b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3037,6 +3037,7 @@ | |||
| 3037 | <Reference name="OpenSim.Framework.Statistics"/> | 3037 | <Reference name="OpenSim.Framework.Statistics"/> |
| 3038 | <Reference name="OpenSim.Region.Framework"/> | 3038 | <Reference name="OpenSim.Region.Framework"/> |
| 3039 | <Reference name="OpenSim.Region.CoreModules"/> | 3039 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3040 | <Reference name="OpenSim.Region.OptionalModules"/> | ||
| 3040 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3041 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 3041 | <Reference name="OpenSim.Services.Interfaces"/> | 3042 | <Reference name="OpenSim.Services.Interfaces"/> |
| 3042 | 3043 | ||