diff options
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index ce32443..cc8bdb6 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
@@ -28,33 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | /* | ||
32 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
33 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
34 | * | ||
35 | * Redistribution and use in source and binary forms, with or without | ||
36 | * modification, are permitted provided that the following conditions are met: | ||
37 | * * Redistributions of source code must retain the above copyright | ||
38 | * notice, this list of conditions and the following disclaimer. | ||
39 | * * Redistributions in binary form must reproduce the above copyright | ||
40 | * notice, this list of conditions and the following disclaimer in the | ||
41 | * documentation and/or other materials provided with the distribution. | ||
42 | * * Neither the name of the OpenSimulator Project nor the | ||
43 | * names of its contributors may be used to endorse or promote products | ||
44 | * derived from this software without specific prior written permission. | ||
45 | * | ||
46 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
47 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
48 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
49 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
50 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
51 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
52 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
53 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
54 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
55 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
56 | */ | ||
57 | |||
58 | using System.IO; | 31 | using System.IO; |
59 | using System.Text; | 32 | using System.Text; |
60 | using HttpServer; | 33 | using HttpServer; |
@@ -77,9 +50,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
77 | private readonly BaseHttpServer m_server; | 50 | private readonly BaseHttpServer m_server; |
78 | private BlockingQueue<PollServiceHttpRequest> m_request; | 51 | private BlockingQueue<PollServiceHttpRequest> m_request; |
79 | private bool m_running = true; | 52 | private bool m_running = true; |
80 | private int m_timeout = 250; | 53 | private int m_timeout = 250; |
81 | |||
82 | |||
83 | 54 | ||
84 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) | 55 | public PollServiceWorkerThread(BaseHttpServer pSrv, int pTimeout) |
85 | { | 56 | { |
@@ -135,4 +106,4 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
135 | m_request.Enqueue(pPollServiceHttpRequest); | 106 | m_request.Enqueue(pPollServiceHttpRequest); |
136 | } | 107 | } |
137 | } | 108 | } |
138 | } | 109 | } \ No newline at end of file |