diff options
| author | ubit | 2012-08-25 16:33:29 +0200 |
|---|---|---|
| committer | ubit | 2012-08-25 16:33:29 +0200 |
| commit | 7a4dba2fdc4b2f33921cc931a7102abd25600927 (patch) | |
| tree | 873d526493b8278a255173923a3c228bb228eeb4 /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |
| parent | try fixing building.. (diff) | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| download | opensim-SC-7a4dba2fdc4b2f33921cc931a7102abd25600927.zip opensim-SC-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.gz opensim-SC-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.bz2 opensim-SC-7a4dba2fdc4b2f33921cc931a7102abd25600927.tar.xz | |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs index a385110..a1dee4e 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |||
| @@ -231,7 +231,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 231 | { | 231 | { |
| 232 | if (m_running) | 232 | if (m_running) |
| 233 | { | 233 | { |
| 234 | if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp) | 234 | if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp || |
| 235 | req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Inventory) | ||
| 235 | { | 236 | { |
| 236 | m_requests.Enqueue(req); | 237 | m_requests.Enqueue(req); |
| 237 | } | 238 | } |