diff options
author | Justin Clark-Casey (justincc) | 2013-06-15 00:46:55 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-06-15 00:46:55 +0100 |
commit | 42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98 (patch) | |
tree | d90fc56aa63e57e345f85bfdb58b58a8aae6c392 /OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |
parent | refactor: In UserProfileModule, change classifiedCache and classifiedInterest... (diff) | |
download | opensim-SC_OLD-42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98.zip opensim-SC_OLD-42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98.tar.gz opensim-SC_OLD-42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98.tar.bz2 opensim-SC_OLD-42b0c68eabcd79ea1d7d5776b399bcbb46bbbf98.tar.xz |
Correct build break in previous commit 9c530d7
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs index 97bb781..d7ffea8 100644 --- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -60,8 +60,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
60 | // The pair of Dictionaries are used to handle the switching of classified ads | 60 | // The pair of Dictionaries are used to handle the switching of classified ads |
61 | // by maintaining a cache of classified id to creator id mappings and an interest | 61 | // by maintaining a cache of classified id to creator id mappings and an interest |
62 | // count. The entries are removed when the interest count reaches 0. | 62 | // count. The entries are removed when the interest count reaches 0. |
63 | Dictionary<UUID,UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); | 63 | Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); |
64 | Dictionary<UUID,int> m_classifiedInterest = new Dictionary<UUID, int>(); | 64 | Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>(); |
65 | 65 | ||
66 | public Scene Scene | 66 | public Scene Scene |
67 | { | 67 | { |
@@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
102 | 102 | ||
103 | /// <summary> | 103 | /// <summary> |
104 | /// Gets or sets a value indicating whether this | 104 | /// Gets or sets a value indicating whether this |
105 | /// <see cref="BlueWall.SlipStream.ProfileModule.UserProfileModule"/> is enabled. | 105 | /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled. |
106 | /// </summary> | 106 | /// </summary> |
107 | /// <value> | 107 | /// <value> |
108 | /// <c>true</c> if enabled; otherwise, <c>false</c>. | 108 | /// <c>true</c> if enabled; otherwise, <c>false</c>. |
@@ -331,15 +331,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
331 | 331 | ||
332 | classifieds[cid] = name; | 332 | classifieds[cid] = name; |
333 | 333 | ||
334 | lock(m_classifiedCache) | 334 | if (!m_classifiedCache.ContainsKey(cid)) |
335 | { | 335 | { |
336 | if (!m_classifiedCache.ContainsKey(cid)) | 336 | lock(m_classifiedCache) |
337 | { | ||
338 | m_classifiedCache.Add(cid,creatorId); | 337 | m_classifiedCache.Add(cid,creatorId); |
339 | 338 | ||
340 | lock(m_classifiedInterest) | 339 | lock(m_classifiedInterest) |
341 | m_classifiedInterest.Add(cid, 0); | 340 | m_classifiedInterest.Add(cid, 0); |
342 | } | ||
343 | } | 341 | } |
344 | 342 | ||
345 | lock(m_classifiedInterest) | 343 | lock(m_classifiedInterest) |
@@ -355,7 +353,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | |||
355 | UserClassifiedAdd ad = new UserClassifiedAdd(); | 353 | UserClassifiedAdd ad = new UserClassifiedAdd(); |
356 | ad.ClassifiedId = queryClassifiedID; | 354 | ad.ClassifiedId = queryClassifiedID; |
357 | 355 | ||
358 | lock (classifie | ||
359 | if (m_classifiedCache.ContainsKey(queryClassifiedID)) | 356 | if (m_classifiedCache.ContainsKey(queryClassifiedID)) |
360 | { | 357 | { |
361 | target = m_classifiedCache[queryClassifiedID]; | 358 | target = m_classifiedCache[queryClassifiedID]; |