diff options
author | Justin Clarke Casey | 2009-02-12 18:31:56 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-12 18:31:56 +0000 |
commit | 34ef01615ca6e606cdb4942b8a1d2ee40f48a227 (patch) | |
tree | ad746cf73bc0481070bd8bb2a54f8b3988a16634 | |
parent | * Forgot to fix bamboo.build for the new ScriptEngine Tests (diff) | |
download | opensim-SC_OLD-34ef01615ca6e606cdb4942b8a1d2ee40f48a227.zip opensim-SC_OLD-34ef01615ca6e606cdb4942b8a1d2ee40f48a227.tar.gz opensim-SC_OLD-34ef01615ca6e606cdb4942b8a1d2ee40f48a227.tar.bz2 opensim-SC_OLD-34ef01615ca6e606cdb4942b8a1d2ee40f48a227.tar.xz |
* Add missing OpenSIm.Framework.Communications ref for Wdinwos builds
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 2 | ||||
-rw-r--r-- | prebuild.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index d5305cc..bb294a5 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -1601,6 +1601,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1601 | 1601 | ||
1602 | if (timed_out) | 1602 | if (timed_out) |
1603 | { | 1603 | { |
1604 | ar.AsyncWaitHandle.Close(); | ||
1605 | |||
1604 | m_log.DebugFormat( | 1606 | m_log.DebugFormat( |
1605 | "[OGS1 GRID SERVICES]: socket [{0}] timed out ({1}) waiting to obtain a connection.", | 1607 | "[OGS1 GRID SERVICES]: socket [{0}] timed out ({1}) waiting to obtain a connection.", |
1606 | m_EndPoint, timeOut * 1000); | 1608 | m_EndPoint, timeOut * 1000); |
diff --git a/prebuild.xml b/prebuild.xml index 2cf29db..2272c06 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | 2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> |
3 | <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev: 8318 $"> | 3 | <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev$"> |
4 | <Configuration name="Debug"> | 4 | <Configuration name="Debug"> |
5 | <Options> | 5 | <Options> |
6 | <CompilerDefines>TRACE;DEBUG</CompilerDefines> | 6 | <CompilerDefines>TRACE;DEBUG</CompilerDefines> |
@@ -2767,6 +2767,7 @@ | |||
2767 | <ReferencePath>../../../bin/</ReferencePath> | 2767 | <ReferencePath>../../../bin/</ReferencePath> |
2768 | <Reference name="System" localCopy="false"/> | 2768 | <Reference name="System" localCopy="false"/> |
2769 | <Reference name="OpenSim.Framework"/> | 2769 | <Reference name="OpenSim.Framework"/> |
2770 | <Reference name="OpenSim.Framework.Communications"/> | ||
2770 | <Reference name="OpenSim.Region.Framework"/> | 2771 | <Reference name="OpenSim.Region.Framework"/> |
2771 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2772 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
2772 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> | 2773 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> |