diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /prebuild.xml | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2543a1b..cb62aec 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3025,6 +3025,8 @@ | |||
| 3025 | <Reference name="OpenSim.Region.Framework"/> | 3025 | <Reference name="OpenSim.Region.Framework"/> |
| 3026 | <Reference name="OpenSim.Region.CoreModules"/> | 3026 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3027 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3027 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 3028 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | ||
| 3029 | <Reference name="OpenSim.Region.ScriptEngine.XEngine"/> | ||
| 3028 | <Reference name="OpenSim.Services.Interfaces"/> | 3030 | <Reference name="OpenSim.Services.Interfaces"/> |
| 3029 | 3031 | ||
| 3030 | <!-- Unit tests --> | 3032 | <!-- Unit tests --> |