OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct build break in previous commit 9c530d7

cpu-performance
Justin Clark-Casey (justincc) 2013-06-15 00:46:55 +01:00
parent 9c530d725f
commit 42b0c68eab
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@ -60,8 +60,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
// The pair of Dictionaries are used to handle the switching of classified ads // The pair of Dictionaries are used to handle the switching of classified ads
// by maintaining a cache of classified id to creator id mappings and an interest // by maintaining a cache of classified id to creator id mappings and an interest
// count. The entries are removed when the interest count reaches 0. // count. The entries are removed when the interest count reaches 0.
Dictionary<UUID,UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
Dictionary<UUID,int> m_classifiedInterest = new Dictionary<UUID, int>(); Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
public Scene Scene public Scene Scene
{ {
@ -102,7 +102,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
/// <summary> /// <summary>
/// Gets or sets a value indicating whether this /// Gets or sets a value indicating whether this
/// <see cref="BlueWall.SlipStream.ProfileModule.UserProfileModule"/> is enabled. /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled.
/// </summary> /// </summary>
/// <value> /// <value>
/// <c>true</c> if enabled; otherwise, <c>false</c>. /// <c>true</c> if enabled; otherwise, <c>false</c>.
@ -331,15 +331,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
classifieds[cid] = name; classifieds[cid] = name;
lock(m_classifiedCache) if (!m_classifiedCache.ContainsKey(cid))
{ {
if (!m_classifiedCache.ContainsKey(cid)) lock(m_classifiedCache)
{
m_classifiedCache.Add(cid,creatorId); m_classifiedCache.Add(cid,creatorId);
lock(m_classifiedInterest) lock(m_classifiedInterest)
m_classifiedInterest.Add(cid, 0); m_classifiedInterest.Add(cid, 0);
}
} }
lock(m_classifiedInterest) lock(m_classifiedInterest)
@ -355,7 +353,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
UserClassifiedAdd ad = new UserClassifiedAdd(); UserClassifiedAdd ad = new UserClassifiedAdd();
ad.ClassifiedId = queryClassifiedID; ad.ClassifiedId = queryClassifiedID;
lock (classifie
if (m_classifiedCache.ContainsKey(queryClassifiedID)) if (m_classifiedCache.ContainsKey(queryClassifiedID))
{ {
target = m_classifiedCache[queryClassifiedID]; target = m_classifiedCache[queryClassifiedID];