aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
diff options
context:
space:
mode:
authorMelanie2012-08-24 23:48:01 +0200
committerMelanie2012-08-24 23:48:01 +0200
commit7e17f4296e91129990c15cdaaa1689922a57f9aa (patch)
tree72ce514a848ed61ab4484923b20557e7c84571a4 /OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
parentFix bad child prim permissions that can make objects change perms after rezzing (diff)
downloadopensim-SC-7e17f4296e91129990c15cdaaa1689922a57f9aa.zip
opensim-SC-7e17f4296e91129990c15cdaaa1689922a57f9aa.tar.gz
opensim-SC-7e17f4296e91129990c15cdaaa1689922a57f9aa.tar.bz2
opensim-SC-7e17f4296e91129990c15cdaaa1689922a57f9aa.tar.xz
Fix background inventory loading (Viewer 3) so it won't lag out the sim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs3
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 }