diff options
| author | Melanie | 2011-12-05 17:10:51 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 17:10:51 +0000 |
| commit | 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch) | |
| tree | 537b010672277073530cf013434fa046aabfec7e /prebuild.xml | |
| parent | Strip CR from http responses and limit them to 2048 chars (diff) | |
| parent | HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff) | |
| download | opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 720d14a..94f9217 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3048,6 +3048,7 @@ | |||
| 3048 | <Reference name="OpenSim.Framework.Servers"/> | 3048 | <Reference name="OpenSim.Framework.Servers"/> |
| 3049 | <Reference name="OpenSim.Framework.Statistics"/> | 3049 | <Reference name="OpenSim.Framework.Statistics"/> |
| 3050 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3050 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
| 3051 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | ||
| 3051 | <Reference name="OpenSim.Region.Framework"/> | 3052 | <Reference name="OpenSim.Region.Framework"/> |
| 3052 | <Reference name="OpenSim.Region.CoreModules"/> | 3053 | <Reference name="OpenSim.Region.CoreModules"/> |
| 3053 | <Reference name="OpenSim.Region.OptionalModules"/> | 3054 | <Reference name="OpenSim.Region.OptionalModules"/> |