diff options
| author | Melanie | 2012-08-31 00:34:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 00:34:22 +0100 |
| commit | fd92560649cc9dd34b7b9a8dfabccf7582661a64 (patch) | |
| tree | 97cc0a6aef597f014bafe62022c2619570f134fa /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-fd92560649cc9dd34b7b9a8dfabccf7582661a64.zip opensim-SC-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.gz opensim-SC-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.bz2 opensim-SC-fd92560649cc9dd34b7b9a8dfabccf7582661a64.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')
| -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 | } |