diff options
author | Sean Dague | 2007-09-11 08:25:32 +0000 |
---|---|---|
committer | Sean Dague | 2007-09-11 08:25:32 +0000 |
commit | a1e2fea7c1fc612da088914aab7a462c212bc97d (patch) | |
tree | b02e50c4662c66d6bbd6b2fed46dac4bec9f4988 /OpenSim/Framework/Communications | |
parent | remove autogenerated files (diff) | |
download | opensim-SC-a1e2fea7c1fc612da088914aab7a462c212bc97d.zip opensim-SC-a1e2fea7c1fc612da088914aab7a462c212bc97d.tar.gz opensim-SC-a1e2fea7c1fc612da088914aab7a462c212bc97d.tar.bz2 opensim-SC-a1e2fea7c1fc612da088914aab7a462c212bc97d.tar.xz |
move the locks closer to the data, sqlite for assets now works like a champ
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 8a16f03..2f4c006 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -200,10 +200,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
200 | //Console.WriteLine("new texture to send"); | 200 | //Console.WriteLine("new texture to send"); |
201 | TextureSender sender = new TextureSender(req); | 201 | TextureSender sender = new TextureSender(req); |
202 | //sender.OnComplete += this.TextureSent; | 202 | //sender.OnComplete += this.TextureSent; |
203 | lock (this.SendingTextures) | 203 | this.SendingTextures.Add(req.ImageInfo.FullID, sender); |
204 | { | ||
205 | this.SendingTextures.Add(req.ImageInfo.FullID, sender); | ||
206 | } | ||
207 | this.QueueTextures.Enqueue(sender); | 204 | this.QueueTextures.Enqueue(sender); |
208 | } | 205 | } |
209 | 206 | ||
@@ -263,11 +260,8 @@ namespace OpenSim.Framework.Communications.Caches | |||
263 | { | 260 | { |
264 | if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) | 261 | if (this.SendingTextures.ContainsKey(sender.request.ImageInfo.FullID)) |
265 | { | 262 | { |
266 | lock (this.SendingTextures) | 263 | this.SendingTextures.Remove(sender.request.ImageInfo.FullID); |
267 | { | 264 | // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); |
268 | this.SendingTextures.Remove(sender.request.ImageInfo.FullID); | ||
269 | // this.AvatarRecievedTextures[sender.request.RequestUser.AgentId].Add(sender.request.ImageInfo.FullID); | ||
270 | } | ||
271 | } | 265 | } |
272 | } | 266 | } |
273 | 267 | ||