aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorDiva Canto2013-07-16 20:28:48 -0700
committerDiva Canto2013-07-16 20:28:48 -0700
commit894554faf61fe8ae02c1348612845ae2553efbd4 (patch)
treeffc5669180a9a46d5266f2fc0ac77de79a825a96 /OpenSim/Region/CoreModules/Framework
parentImprovements to the ServiceThrottleModule: added a category and an itemid to ... (diff)
downloadopensim-SC_OLD-894554faf61fe8ae02c1348612845ae2553efbd4.zip
opensim-SC_OLD-894554faf61fe8ae02c1348612845ae2553efbd4.tar.gz
opensim-SC_OLD-894554faf61fe8ae02c1348612845ae2553efbd4.tar.bz2
opensim-SC_OLD-894554faf61fe8ae02c1348612845ae2553efbd4.tar.xz
Removed the MapItems thread. Redirected the map items requests to the services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
index 1554b3e..a70261e 100644
--- a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -181,11 +181,10 @@ namespace OpenSim.Region.CoreModules.Framework
181 181
182 m_RequestQueue.Enqueue(delegate 182 m_RequestQueue.Enqueue(delegate
183 { 183 {
184 continuation();
185 lock (m_RequestQueue) 184 lock (m_RequestQueue)
186 {
187 m_Pending[category].Remove(itemid); 185 m_Pending[category].Remove(itemid);
188 } 186
187 continuation();
189 }); 188 });
190 } 189 }
191 } 190 }