diff options
| author | Melanie | 2009-10-08 08:07:38 +0100 |
|---|---|---|
| committer | Melanie | 2009-10-08 08:07:38 +0100 |
| commit | fe679be9e76190ac0dc8892469787e63a7a48b5c (patch) | |
| tree | 220ef33da75f09b3e7ef3684c5ed7367e175691e /prebuild.xml | |
| parent | store owner_uuid in the region table (diff) | |
| parent | One last attempt at tunning the locking/no locking behaviour. The previous on... (diff) | |
| download | opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.zip opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.gz opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.bz2 opensim-SC_OLD-fe679be9e76190ac0dc8892469787e63a7a48b5c.tar.xz | |
Merge branch 'htb-throttle'
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index e58b81b..bba54f3 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -131,6 +131,7 @@ | |||
| 131 | 131 | ||
| 132 | <ReferencePath>../../bin/</ReferencePath> | 132 | <ReferencePath>../../bin/</ReferencePath> |
| 133 | <Reference name="System"/> | 133 | <Reference name="System"/> |
| 134 | <Reference name="System.Core"/> | ||
| 134 | <Reference name="System.Xml"/> | 135 | <Reference name="System.Xml"/> |
| 135 | <Reference name="System.Data"/> | 136 | <Reference name="System.Data"/> |
| 136 | <Reference name="System.Drawing"/> | 137 | <Reference name="System.Drawing"/> |
| @@ -1750,6 +1751,7 @@ | |||
| 1750 | 1751 | ||
| 1751 | <ReferencePath>../../../../bin/</ReferencePath> | 1752 | <ReferencePath>../../../../bin/</ReferencePath> |
| 1752 | <Reference name="System"/> | 1753 | <Reference name="System"/> |
| 1754 | <Reference name="System.Core"/> | ||
| 1753 | <Reference name="System.Xml"/> | 1755 | <Reference name="System.Xml"/> |
| 1754 | <Reference name="OpenMetaverseTypes.dll"/> | 1756 | <Reference name="OpenMetaverseTypes.dll"/> |
| 1755 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1757 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
| @@ -3689,6 +3691,7 @@ | |||
| 3689 | </Files> | 3691 | </Files> |
| 3690 | </Project> | 3692 | </Project> |
| 3691 | 3693 | ||
| 3694 | <!-- Commented for now until new unit tests are written for the new LLUDP implementation | ||
| 3692 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/LindenUDP/Tests" type="Library"> | 3695 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/LindenUDP/Tests" type="Library"> |
| 3693 | <Configuration name="Debug"> | 3696 | <Configuration name="Debug"> |
| 3694 | <Options> | 3697 | <Options> |
| @@ -3722,6 +3725,7 @@ | |||
| 3722 | <Match pattern="*.cs" recurse="false"/> | 3725 | <Match pattern="*.cs" recurse="false"/> |
| 3723 | </Files> | 3726 | </Files> |
| 3724 | </Project> | 3727 | </Project> |
| 3728 | --> | ||
| 3725 | 3729 | ||
| 3726 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library"> | 3730 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library"> |
| 3727 | <Configuration name="Debug"> | 3731 | <Configuration name="Debug"> |