diff options
| author | Diva Canto | 2009-09-21 11:05:20 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-21 11:05:20 -0700 |
| commit | 6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735 (patch) | |
| tree | 552d9966f891056b3fac1868aefb7491bf381882 /OpenSim/Framework/Servers | |
| parent | Added grid handler and grid remote connector. (diff) | |
| parent | Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic (diff) | |
| download | opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.zip opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.gz opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.bz2 opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index fed490e..ed387d1 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
| @@ -34,7 +34,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 34 | 34 | ||
| 35 | public delegate Hashtable GetEventsMethod(UUID pId, string request); | 35 | public delegate Hashtable GetEventsMethod(UUID pId, string request); |
| 36 | 36 | ||
| 37 | public delegate Hashtable NoEventsMethod(); | 37 | public delegate Hashtable NoEventsMethod(UUID pId); |
| 38 | 38 | ||
| 39 | public class PollServiceEventArgs : EventArgs | 39 | public class PollServiceEventArgs : EventArgs |
| 40 | { | 40 | { |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index 4020190..db80f1d 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -130,7 +130,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 130 | foreach (object o in m_requests) | 130 | foreach (object o in m_requests) |
| 131 | { | 131 | { |
| 132 | PollServiceHttpRequest req = (PollServiceHttpRequest) o; | 132 | PollServiceHttpRequest req = (PollServiceHttpRequest) o; |
| 133 | m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext)); | 133 | m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.PollServiceArgs.Id), new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request), req.HttpContext)); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | m_requests.Clear(); | 136 | m_requests.Clear(); |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs index 41fb376..1e8706c 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |||
| @@ -112,7 +112,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 112 | { | 112 | { |
| 113 | if ((Environment.TickCount - req.RequestTime) > m_timeout) | 113 | if ((Environment.TickCount - req.RequestTime) > m_timeout) |
| 114 | { | 114 | { |
| 115 | m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(), | 115 | m_server.DoHTTPGruntWork(req.PollServiceArgs.NoEvents(req.PollServiceArgs.Id), |
| 116 | new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); | 116 | new OSHttpResponse(new HttpResponse(req.HttpContext, req.Request),req.HttpContext)); |
| 117 | } | 117 | } |
| 118 | else | 118 | else |