From 7e17f4296e91129990c15cdaaa1689922a57f9aa Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 24 Aug 2012 23:48:01 +0200
Subject: Fix background inventory loading (Viewer 3) so it won't lag out the
 sim

---
 OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs      | 3 ++-
 OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index bb43cd2..c24a000 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Framework.Servers.HttpServer
         public enum EventType : int
         {
             Normal = 0,
-            LslHttp = 1
+            LslHttp = 1,
+            Inventory = 2
         }
 
         public PollServiceEventArgs(
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
         {
             if (m_running)
             {
-                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp)
+                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LslHttp ||
+                    req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Inventory)
                 {
                     m_requests.Enqueue(req);
                 }
-- 
cgit v1.1