diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 7dd9770..707cc93 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -35,7 +35,6 @@ using Nini.Config; | |||
35 | using Mono.Addins; | 35 | using Mono.Addins; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Framework.Monitoring; | ||
39 | using OpenSim.Framework.Servers; | 38 | using OpenSim.Framework.Servers; |
40 | using OpenSim.Framework.Servers.HttpServer; | 39 | using OpenSim.Framework.Servers.HttpServer; |
41 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
@@ -44,6 +43,7 @@ using OpenSim.Framework.Capabilities; | |||
44 | using OpenSim.Services.Interfaces; | 43 | using OpenSim.Services.Interfaces; |
45 | using Caps = OpenSim.Framework.Capabilities.Caps; | 44 | using Caps = OpenSim.Framework.Capabilities.Caps; |
46 | using OpenSim.Capabilities.Handlers; | 45 | using OpenSim.Capabilities.Handlers; |
46 | using OpenSim.Framework.Monitoring; | ||
47 | using OpenMetaverse; | 47 | using OpenMetaverse; |
48 | using OpenMetaverse.StructuredData; | 48 | using OpenMetaverse.StructuredData; |
49 | 49 | ||
@@ -156,12 +156,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
156 | private Scene m_scene; | 156 | private Scene m_scene; |
157 | 157 | ||
158 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : | 158 | public PollServiceInventoryEventArgs(Scene scene, UUID pId) : |
159 | base(null, null, null, null, pId) | 159 | base(null, null, null, null, pId, int.MaxValue) |
160 | { | 160 | { |
161 | m_scene = scene; | 161 | m_scene = scene; |
162 | 162 | ||
163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; | 163 | HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); }; |
164 | GetEvents = (x, y, z) => | 164 | GetEvents = (x, y) => |
165 | { | 165 | { |
166 | lock (responses) | 166 | lock (responses) |
167 | { | 167 | { |
@@ -229,7 +229,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
229 | { | 229 | { |
230 | if (!reqinfo.folders.Contains(folderID)) | 230 | if (!reqinfo.folders.Contains(folderID)) |
231 | { | 231 | { |
232 | //TODO: Port COF handling from Avination | 232 | if (sp.COF != UUID.Zero && sp.COF == folderID) |
233 | highPriority = true; | ||
233 | reqinfo.folders.Add(folderID); | 234 | reqinfo.folders.Add(folderID); |
234 | } | 235 | } |
235 | } | 236 | } |
@@ -288,6 +289,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
288 | // Register this as a poll service | 289 | // Register this as a poll service |
289 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); | 290 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID); |
290 | 291 | ||
292 | args.Type = PollServiceEventArgs.EventType.Inventory; | ||
291 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 293 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
292 | 294 | ||
293 | string hostName = m_scene.RegionInfo.ExternalHostName; | 295 | string hostName = m_scene.RegionInfo.ExternalHostName; |