aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps
diff options
context:
space:
mode:
authorUbitUmarov2016-07-17 22:52:58 +0100
committerUbitUmarov2016-07-17 22:52:58 +0100
commiteaefae7e20c95266ad84ea59912cf8c011ccd1b5 (patch)
tree29a8d483e9fdbcad69e1535f89e7abcf838ea136 /OpenSim/Region/ClientStack/Linden/Caps
parentdont try dequeues if didnt reacquired lock (diff)
downloadopensim-SC-eaefae7e20c95266ad84ea59912cf8c011ccd1b5.zip
opensim-SC-eaefae7e20c95266ad84ea59912cf8c011ccd1b5.tar.gz
opensim-SC-eaefae7e20c95266ad84ea59912cf8c011ccd1b5.tar.bz2
opensim-SC-eaefae7e20c95266ad84ea59912cf8c011ccd1b5.tar.xz
don't loose inventory items when there are bad folders
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index ed5b3dd..0277a24 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -61,7 +61,6 @@ namespace OpenSim.Region.ClientStack.Linden
61 public UUID reqID; 61 public UUID reqID;
62 public Hashtable request; 62 public Hashtable request;
63 public ScenePresence presence; 63 public ScenePresence presence;
64 public List<UUID> folders;
65 } 64 }
66 65
67 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 66 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -296,8 +295,10 @@ namespace OpenSim.Region.ClientStack.Linden
296 reqinfo.reqID = x; 295 reqinfo.reqID = x;
297 reqinfo.request = y; 296 reqinfo.request = y;
298 reqinfo.presence = sp; 297 reqinfo.presence = sp;
299 reqinfo.folders = new List<UUID>();
300 298
299/* why where we doing this? just to get cof ?
300 List<UUID> folders = new List<UUID>();
301
301 // Decode the request here 302 // Decode the request here
302 string request = y["body"].ToString(); 303 string request = y["body"].ToString();
303 304
@@ -333,11 +334,11 @@ namespace OpenSim.Region.ClientStack.Linden
333 UUID folderID; 334 UUID folderID;
334 if (UUID.TryParse(folder, out folderID)) 335 if (UUID.TryParse(folder, out folderID))
335 { 336 {
336 if (!reqinfo.folders.Contains(folderID)) 337 if (!folders.Contains(folderID))
337 { 338 {
338 if (sp.COF != UUID.Zero && sp.COF == folderID) 339 if (sp.COF != UUID.Zero && sp.COF == folderID)
339 highPriority = true; 340 highPriority = true;
340 reqinfo.folders.Add(folderID); 341 folders.Add(folderID);
341 } 342 }
342 } 343 }
343 } 344 }
@@ -345,6 +346,7 @@ namespace OpenSim.Region.ClientStack.Linden
345 if (highPriority) 346 if (highPriority)
346 m_queue.PriorityEnqueue(reqinfo); 347 m_queue.PriorityEnqueue(reqinfo);
347 else 348 else
349*/
348 m_queue.Enqueue(reqinfo); 350 m_queue.Enqueue(reqinfo);
349 }; 351 };
350 352
@@ -406,7 +408,6 @@ namespace OpenSim.Region.ClientStack.Linden
406 if(dropedResponses.Contains(requestID)) 408 if(dropedResponses.Contains(requestID))
407 { 409 {
408 dropedResponses.Remove(requestID); 410 dropedResponses.Remove(requestID);
409 requestinfo.folders.Clear();
410 requestinfo.request.Clear(); 411 requestinfo.request.Clear();
411 WebFetchInvDescModule.ProcessedRequestsCount++; 412 WebFetchInvDescModule.ProcessedRequestsCount++;
412 return; 413 return;
@@ -417,7 +418,6 @@ namespace OpenSim.Region.ClientStack.Linden
417 m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054"); 418 m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054");
418 responses[requestID] = response; 419 responses[requestID] = response;
419 } 420 }
420 requestinfo.folders.Clear();
421 requestinfo.request.Clear(); 421 requestinfo.request.Clear();
422 WebFetchInvDescModule.ProcessedRequestsCount++; 422 WebFetchInvDescModule.ProcessedRequestsCount++;
423 } 423 }