diff options
| author | Jonathan Freedman | 2010-10-29 23:46:53 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:46:53 -0400 |
| commit | 594f23ff225b4c4d438a89eefd6337cf281e093c (patch) | |
| tree | f617129f759c91ff27b07f2e8f23712a9800c45e /prebuild.xml | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with l... (diff) | |
| download | opensim-SC_OLD-594f23ff225b4c4d438a89eefd6337cf281e093c.zip opensim-SC_OLD-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.gz opensim-SC_OLD-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.bz2 opensim-SC_OLD-594f23ff225b4c4d438a89eefd6337cf281e093c.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Services/GridService/HypergridLinker.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 dd4a576..c6eb65a 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1084,6 +1084,7 @@ | |||
| 1084 | 1084 | ||
| 1085 | <ReferencePath>../../../bin/</ReferencePath> | 1085 | <ReferencePath>../../../bin/</ReferencePath> |
| 1086 | <Reference name="System"/> | 1086 | <Reference name="System"/> |
| 1087 | <Reference name="System.Core"/> | ||
| 1087 | <Reference name="System.Xml"/> | 1088 | <Reference name="System.Xml"/> |
| 1088 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1089 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 1089 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1090 | <Reference name="OpenMetaverse" path="../../../bin/"/> |