diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/GenericAsyncResult.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 1 |
2 files changed, 3 insertions, 1 deletions
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 | |||
41 | private byte m_completed; | 41 | private byte m_completed; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Did process complete synchroneously? | 44 | /// Did process complete synchronously? |
45 | /// </summary> | 45 | /// </summary> |
46 | /// <remarks>I have a hard time imagining a scenario where this is the case, again, same issue about | 46 | /// <remarks>I have a hard time imagining a scenario where this is the case, again, same issue about |
47 | /// booleans and VolatileRead as m_completed | 47 | /// booleans and VolatileRead as m_completed |
@@ -87,6 +87,7 @@ namespace OpenSim.Framework.Communications | |||
87 | } | 87 | } |
88 | } | 88 | } |
89 | } | 89 | } |
90 | |||
90 | return m_waitHandle; | 91 | return m_waitHandle; |
91 | } | 92 | } |
92 | } | 93 | } |
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 | |||
108 | { | 108 | { |
109 | // Temporary fix | 109 | // Temporary fix |
110 | m_loginMutex.WaitOne(); | 110 | m_loginMutex.WaitOne(); |
111 | |||
111 | try | 112 | try |
112 | { | 113 | { |
113 | //CFK: CustomizeResponse contains sufficient strings to alleviate the need for this. | 114 | //CFK: CustomizeResponse contains sufficient strings to alleviate the need for this. |