From 664f983943dd94d35184f5c0f69f8c58a011ba3a Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 23 Jan 2009 19:24:36 +0000
Subject: * Extend archive test to check for the presence of a control file in
a saved archive
---
OpenSim/Framework/Communications/GenericAsyncResult.cs | 3 ++-
OpenSim/Framework/Communications/LoginService.cs | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Framework/Communications')
diff --git a/OpenSim/Framework/Communications/GenericAsyncResult.cs b/OpenSim/Framework/Communications/GenericAsyncResult.cs
index e85289a..62a921a 100644
--- a/OpenSim/Framework/Communications/GenericAsyncResult.cs
+++ b/OpenSim/Framework/Communications/GenericAsyncResult.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications
private byte m_completed;
///
- /// Did process complete synchroneously?
+ /// Did process complete synchronously?
///
/// I have a hard time imagining a scenario where this is the case, again, same issue about
/// booleans and VolatileRead as m_completed
@@ -87,6 +87,7 @@ namespace OpenSim.Framework.Communications
}
}
}
+
return m_waitHandle;
}
}
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 1abfc78..fe904b5 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -108,6 +108,7 @@ namespace OpenSim.Framework.Communications
{
// Temporary fix
m_loginMutex.WaitOne();
+
try
{
//CFK: CustomizeResponse contains sufficient strings to alleviate the need for this.
--
cgit v1.1