aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-26 00:13:04 +0000
committerJustin Clark-Casey (justincc)2011-11-26 00:13:04 +0000
commitc5b636469ddaec551101049a0eaf5f1c08fdef1e (patch)
tree03a8fb4842a748752ca19a5186cdab04bf2bb3d1
parentFix config so that you can have both WebFetchInventoryDescendents and FetchIn... (diff)
downloadopensim-SC_OLD-c5b636469ddaec551101049a0eaf5f1c08fdef1e.zip
opensim-SC_OLD-c5b636469ddaec551101049a0eaf5f1c08fdef1e.tar.gz
opensim-SC_OLD-c5b636469ddaec551101049a0eaf5f1c08fdef1e.tar.bz2
opensim-SC_OLD-c5b636469ddaec551101049a0eaf5f1c08fdef1e.tar.xz
Stop locking the requests coming in to WebFetchInvDecHandler.
There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests.
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
index 08570bc..de7abe2 100644
--- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Capabilities.Handlers
49 49
50 private IInventoryService m_InventoryService; 50 private IInventoryService m_InventoryService;
51 private ILibraryService m_LibraryService; 51 private ILibraryService m_LibraryService;
52 private object m_fetchLock = new Object(); 52// private object m_fetchLock = new Object();
53 53
54 public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 54 public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService)
55 { 55 {
@@ -59,8 +59,8 @@ namespace OpenSim.Capabilities.Handlers
59 59
60 public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 60 public string FetchInventoryDescendentsRequest(string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
61 { 61 {
62 lock (m_fetchLock) 62// lock (m_fetchLock)
63 { 63// {
64// m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request); 64// m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Received request {0}", request);
65 65
66 // nasty temporary hack here, the linden client falsely 66 // nasty temporary hack here, the linden client falsely
@@ -135,7 +135,7 @@ namespace OpenSim.Capabilities.Handlers
135 135
136 return response; 136 return response;
137 137
138 } 138// }
139 } 139 }
140 140
141 /// <summary> 141 /// <summary>
@@ -188,9 +188,9 @@ namespace OpenSim.Capabilities.Handlers
188 UUID agentID, UUID folderID, UUID ownerID, 188 UUID agentID, UUID folderID, UUID ownerID,
189 bool fetchFolders, bool fetchItems, int sortOrder, out int version) 189 bool fetchFolders, bool fetchItems, int sortOrder, out int version)
190 { 190 {
191 m_log.DebugFormat( 191// m_log.DebugFormat(
192 "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", 192// "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
193 fetchFolders, fetchItems, folderID, agentID); 193// fetchFolders, fetchItems, folderID, agentID);
194 194
195 version = 0; 195 version = 0;
196 InventoryFolderImpl fold; 196 InventoryFolderImpl fold;
@@ -220,7 +220,7 @@ namespace OpenSim.Capabilities.Handlers
220 } 220 }
221 else 221 else
222 { 222 {
223 // Lost itemsm don't really need a version 223 // Lost items don't really need a version
224 version = 1; 224 version = 1;
225 } 225 }
226 226