aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorUbitUmarov2018-12-04 21:56:39 +0000
committerUbitUmarov2018-12-04 21:56:39 +0000
commitdeb0ab7400278b54d29e907f3a4dc5ad208117e6 (patch)
tree5b65d8d58936c16370cdf0527e896e4a43326642 /OpenSim/Region/ClientStack/Linden
parentclean a bit (diff)
downloadopensim-SC-deb0ab7400278b54d29e907f3a4dc5ad208117e6.zip
opensim-SC-deb0ab7400278b54d29e907f3a4dc5ad208117e6.tar.gz
opensim-SC-deb0ab7400278b54d29e907f3a4dc5ad208117e6.tar.bz2
opensim-SC-deb0ab7400278b54d29e907f3a4dc5ad208117e6.tar.xz
GetAssets: we still need to service avatars that did left region
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs1
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
index 51a6ecc..dfb16fa 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
@@ -212,6 +212,7 @@ namespace OpenSim.Region.ClientStack.Linden
212 Watchdog.UpdateThread(); 212 Watchdog.UpdateThread();
213 if (poolreq.reqID != UUID.Zero) 213 if (poolreq.reqID != UUID.Zero)
214 poolreq.thepoll.Process(poolreq); 214 poolreq.thepoll.Process(poolreq);
215 poolreq = null;
215 } 216 }
216 Watchdog.UpdateThread(); 217 Watchdog.UpdateThread();
217 } 218 }
@@ -323,7 +324,7 @@ namespace OpenSim.Region.ClientStack.Linden
323 return; 324 return;
324 } 325 }
325 } 326 }
326 327/* can't do this with current viewers; HG problem
327 // If the avatar is gone, don't bother to get the texture 328 // If the avatar is gone, don't bother to get the texture
328 if(m_scene.GetScenePresence(Id) == null) 329 if(m_scene.GetScenePresence(Id) == null)
329 { 330 {
@@ -335,6 +336,7 @@ namespace OpenSim.Region.ClientStack.Linden
335 responses[requestID] = new APollResponse() { bytes = 0, response = curresponse }; 336 responses[requestID] = new APollResponse() { bytes = 0, response = curresponse };
336 return; 337 return;
337 } 338 }
339*/
338 } 340 }
339 341
340 curresponse = m_getAssetHandler.Handle(requestinfo.request); 342 curresponse = m_getAssetHandler.Handle(requestinfo.request);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index c986233..41d70a3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -403,6 +403,7 @@ namespace OpenSim.Region.ClientStack.Linden
403 Watchdog.UpdateThread(); 403 Watchdog.UpdateThread();
404 if (poolreq.thepoll != null) 404 if (poolreq.thepoll != null)
405 poolreq.thepoll.Process(poolreq); 405 poolreq.thepoll.Process(poolreq);
406 poolreq = null;
406 } 407 }
407 Watchdog.UpdateThread(); 408 Watchdog.UpdateThread();
408 } 409 }