diff options
| author | Melanie | 2012-06-07 23:33:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-07 23:33:40 +0100 |
| commit | e8cd9fbbb748aed1caac4a5d20d7e723351349dd (patch) | |
| tree | b901dfb2ebf4237a77aeebf1fbb929456a615693 /prebuild.xml | |
| parent | Remove a null ref when an avatar's attachment gets the avatar velocity (diff) | |
| parent | Record the fact that child agents can have asset transactions. (diff) | |
| download | opensim-SC_OLD-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.zip opensim-SC_OLD-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.gz opensim-SC_OLD-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.bz2 opensim-SC_OLD-e8cd9fbbb748aed1caac4a5d20d7e723351349dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.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 c840f03..3a64af9 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -126,6 +126,7 @@ | |||
| 126 | 126 | ||
| 127 | <ReferencePath>../../../../bin/</ReferencePath> | 127 | <ReferencePath>../../../../bin/</ReferencePath> |
| 128 | <Reference name="System"/> | 128 | <Reference name="System"/> |
| 129 | <Reference name="System.Core"/> | ||
| 129 | <Reference name="System.Xml"/> | 130 | <Reference name="System.Xml"/> |
| 130 | <Reference name="System.Web"/> | 131 | <Reference name="System.Web"/> |
| 131 | <Reference name="OpenSim.Framework"/> | 132 | <Reference name="OpenSim.Framework"/> |