diff options
| author | Melanie | 2012-07-11 03:56:50 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-11 03:56:50 +0100 |
| commit | 0bc8238a6c25bc42438caee0cf42deec00f26b8e (patch) | |
| tree | a046cace418e2e7714818c60242698d0dd9cb4f4 /prebuild.xml | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | If a part has a sit target and an avatar is already sitting, allow another av... (diff) | |
| download | opensim-SC_OLD-0bc8238a6c25bc42438caee0cf42deec00f26b8e.zip opensim-SC_OLD-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.gz opensim-SC_OLD-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.bz2 opensim-SC_OLD-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
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 21bf71f..2543a1b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3138,6 +3138,7 @@ | |||
| 3138 | 3138 | ||
| 3139 | <ReferencePath>../../../bin/</ReferencePath> | 3139 | <ReferencePath>../../../bin/</ReferencePath> |
| 3140 | <Reference name="System"/> | 3140 | <Reference name="System"/> |
| 3141 | <Reference name="System.Core"/> | ||
| 3141 | <Reference name="System.Xml"/> | 3142 | <Reference name="System.Xml"/> |
| 3142 | <Reference name="System.Drawing"/> | 3143 | <Reference name="System.Drawing"/> |
| 3143 | <Reference name="System.Runtime.Remoting"/> | 3144 | <Reference name="System.Runtime.Remoting"/> |