aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps
diff options
context:
space:
mode:
authorUbitUmarov2012-09-17 22:35:36 +0100
committerUbitUmarov2012-09-17 22:35:36 +0100
commitfd20ef5c91f5db119d17b1974805b6d4fc2abad3 (patch)
tree7d65744e1003d77b9b944406642166a524ea4b4d /OpenSim/Region/ClientStack/Linden/Caps
parenton upload store mesh list contents as mesh assets. Build prims by instances not (diff)
downloadopensim-SC-fd20ef5c91f5db119d17b1974805b6d4fc2abad3.zip
opensim-SC-fd20ef5c91f5db119d17b1974805b6d4fc2abad3.tar.gz
opensim-SC-fd20ef5c91f5db119d17b1974805b6d4fc2abad3.tar.bz2
opensim-SC-fd20ef5c91f5db119d17b1974805b6d4fc2abad3.tar.xz
add some locks to GetTextureModule
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs23
1 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 5b125ea..0ac56ec 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -149,13 +149,16 @@ namespace OpenSim.Region.ClientStack.Linden
149 HasEvents = (x, y) => { return this.responses.ContainsKey(x); }; 149 HasEvents = (x, y) => { return this.responses.ContainsKey(x); };
150 GetEvents = (x, y, s) => 150 GetEvents = (x, y, s) =>
151 { 151 {
152 try 152 lock (responses)
153 { 153 {
154 return this.responses[x]; 154 try
155 } 155 {
156 finally 156 return this.responses[x];
157 { 157 }
158 responses.Remove(x); 158 finally
159 {
160 responses.Remove(x);
161 }
159 } 162 }
160 }; 163 };
161 164
@@ -218,14 +221,14 @@ namespace OpenSim.Region.ClientStack.Linden
218 response["content_type"] = "text/plain"; 221 response["content_type"] = "text/plain";
219 response["keepalive"] = false; 222 response["keepalive"] = false;
220 response["reusecontext"] = false; 223 response["reusecontext"] = false;
221 224 lock (responses)
222 responses[requestID] = response; 225 responses[requestID] = response;
223 return; 226 return;
224 } 227 }
225 228
226 response = m_getTextureHandler.Handle(request); 229 response = m_getTextureHandler.Handle(request);
227 230 lock (responses)
228 responses[requestID] = response; 231 responses[requestID] = response;
229 } 232 }
230 } 233 }
231 234