diff options
| author | Dan Lake | 2012-02-03 15:21:07 -0800 |
|---|---|---|
| committer | Dan Lake | 2012-02-03 15:21:07 -0800 |
| commit | ea19e50919afdf2aee3d123437eef82fc59663a1 (patch) | |
| tree | c45b94ef98eab9115a69d70c4159769daea5c3d1 /prebuild.xml | |
| parent | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before tri... (diff) | |
| parent | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ... (diff) | |
| download | opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.zip opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.gz opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.bz2 opensim-SC-ea19e50919afdf2aee3d123437eef82fc59663a1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.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 65383ee..c402cf5 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -218,6 +218,7 @@ | |||
| 218 | 218 | ||
| 219 | <ReferencePath>../../../bin/</ReferencePath> | 219 | <ReferencePath>../../../bin/</ReferencePath> |
| 220 | <Reference name="System"/> | 220 | <Reference name="System"/> |
| 221 | <Reference name="System.Core"/> | ||
| 221 | <Reference name="System.Xml"/> | 222 | <Reference name="System.Xml"/> |
| 222 | <Reference name="log4net" path="../../../bin/"/> | 223 | <Reference name="log4net" path="../../../bin/"/> |
| 223 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 224 | <Reference name="OpenMetaverse" path="../../../bin/"/> |