diff options
| author | Melanie | 2011-11-19 22:39:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-19 22:39:15 +0000 |
| commit | bdb5ac96d9432eb568ed3e3bb46b012365f884bc (patch) | |
| tree | fe2ce2636be7e750b3f235a6c04b9f3a5cf2f8af /prebuild.xml | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCre... (diff) | |
| download | opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.zip opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.gz opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.bz2 opensim-SC_OLD-bdb5ac96d9432eb568ed3e3bb46b012365f884bc.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 56e7904..720d14a 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -1801,6 +1801,7 @@ | |||
| 1801 | 1801 | ||
| 1802 | <ReferencePath>../../../bin/</ReferencePath> | 1802 | <ReferencePath>../../../bin/</ReferencePath> |
| 1803 | <Reference name="System"/> | 1803 | <Reference name="System"/> |
| 1804 | <Reference name="System.Core"/> | ||
| 1804 | <Reference name="System.Xml"/> | 1805 | <Reference name="System.Xml"/> |
| 1805 | <Reference name="Mono.Addins" path="../../../bin/"/> | 1806 | <Reference name="Mono.Addins" path="../../../bin/"/> |
| 1806 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1807 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| @@ -2066,6 +2067,7 @@ | |||
| 2066 | 2067 | ||
| 2067 | <ReferencePath>../../../bin/</ReferencePath> | 2068 | <ReferencePath>../../../bin/</ReferencePath> |
| 2068 | <Reference name="System"/> | 2069 | <Reference name="System"/> |
| 2070 | <Reference name="System.Core"/> | ||
| 2069 | <Reference name="System.Xml"/> | 2071 | <Reference name="System.Xml"/> |
| 2070 | <Reference name="System.Data"/> | 2072 | <Reference name="System.Data"/> |
| 2071 | <Reference name="OpenSim.Capabilities"/> | 2073 | <Reference name="OpenSim.Capabilities"/> |
| @@ -2425,6 +2427,7 @@ | |||
| 2425 | 2427 | ||
| 2426 | <ReferencePath>../../../../bin/</ReferencePath> | 2428 | <ReferencePath>../../../../bin/</ReferencePath> |
| 2427 | <Reference name="System"/> | 2429 | <Reference name="System"/> |
| 2430 | <Reference name="System.Core"/> | ||
| 2428 | <Reference name="System.Data"/> | 2431 | <Reference name="System.Data"/> |
| 2429 | <Reference name="System.Web"/> | 2432 | <Reference name="System.Web"/> |
| 2430 | <Reference name="System.Xml"/> | 2433 | <Reference name="System.Xml"/> |