diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /prebuild.xml | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC_OLD-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index de3b89b..f6e0f4b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -585,7 +585,6 @@ | |||
| 585 | <Reference name="OpenSim.Framework.Console"/> | 585 | <Reference name="OpenSim.Framework.Console"/> |
| 586 | <Reference name="OpenSim.Region.Physics.Manager"/> | 586 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 587 | <Reference name="log4net" path="../../../../bin/"/> | 587 | <Reference name="log4net" path="../../../../bin/"/> |
| 588 | <Reference name="zlib.net" path="../../../../bin/"/> | ||
| 589 | 588 | ||
| 590 | <Files> | 589 | <Files> |
| 591 | <Match pattern="*.cs" recurse="true"/> | 590 | <Match pattern="*.cs" recurse="true"/> |