diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs index 8a607fb..5169f65 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -151,12 +151,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
151 | private Scene m_scene; | 151 | private Scene m_scene; |
152 | 152 | ||
153 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : | 153 | public PollServiceTextureEventArgs(UUID pId, Scene scene) : |
154 | base(null, null, null, null, pId, int.MaxValue) | 154 | base(null, null, null, null, pId, int.MaxValue) |
155 | // this should never timeout | ||
156 | // each request must be processed and return a response | ||
157 | // noevents can possible be use for nice shutdown, but not sure now | ||
158 | // the execution will provide a proper response even if it fails | ||
159 | |||
160 | { | 155 | { |
161 | m_scene = scene; | 156 | m_scene = scene; |
162 | 157 | ||
@@ -219,7 +214,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
219 | UUID requestID = requestinfo.reqID; | 214 | UUID requestID = requestinfo.reqID; |
220 | 215 | ||
221 | // If the avatar is gone, don't bother to get the texture | 216 | // If the avatar is gone, don't bother to get the texture |
222 | |||
223 | if (m_scene.GetScenePresence(Id) == null) | 217 | if (m_scene.GetScenePresence(Id) == null) |
224 | { | 218 | { |
225 | response = new Hashtable(); | 219 | response = new Hashtable(); |
@@ -246,12 +240,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
246 | { | 240 | { |
247 | string capUrl = "/CAPS/" + UUID.Random() + "/"; | 241 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
248 | 242 | ||
249 | // Register this as a poll service | 243 | // Register this as a poll service |
250 | // absurd large timeout to tune later to make a bit less than viewer | ||
251 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); | 244 | PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); |
252 | 245 | ||
253 | args.Type = PollServiceEventArgs.EventType.Texture; | 246 | args.Type = PollServiceEventArgs.EventType.Texture; |
254 | args.GetEventsNeedsRequest = false; | ||
255 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 247 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
256 | 248 | ||
257 | string hostName = m_scene.RegionInfo.ExternalHostName; | 249 | string hostName = m_scene.RegionInfo.ExternalHostName; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 56070c6..0f305b1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -223,7 +223,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
223 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID); | 223 | PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(agentID); |
224 | 224 | ||
225 | args.Type = PollServiceEventArgs.EventType.Inventory; | 225 | args.Type = PollServiceEventArgs.EventType.Inventory; |
226 | args.GetEventsNeedsRequest = false; | ||
227 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); | 226 | MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); |
228 | 227 | ||
229 | string hostName = m_scene.RegionInfo.ExternalHostName; | 228 | string hostName = m_scene.RegionInfo.ExternalHostName; |