ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster

Browse Source
This commit is contained in:
Melanie
2013-06-06 03:04:47 +01:00
parent 648e258b8e e449950030
commit ea9e1d1a1e
4 changed files with 68 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,6 +169,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
void HandleOnMakeRootAgent (ScenePresence obj)
{
if(obj.PresenceType == PresenceType.Npc)
return;
GetImageAssets(((IScenePresence)obj).UUID);
}
@@ -326,14 +329,17 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
string name = m["name"].AsString();
classifieds[cid] = name;
if(!classifiedCache.ContainsKey(cid))
{
classifiedCache.Add(cid,creatorId);
classifiedInterest.Add(cid, 0);
lock(classifiedCache)
classifiedCache.Add(cid,creatorId);
lock(classifiedInterest)
classifiedInterest.Add(cid, 0);
}
classifiedInterest[cid] ++;
lock(classifiedInterest)
classifiedInterest[cid] ++;
}
remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
@@ -346,22 +352,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
ad.ClassifiedId = queryClassifiedID;
if(classifiedCache.ContainsKey(queryClassifiedID))
{
{
target = classifiedCache[queryClassifiedID];
if(classifiedInterest[queryClassifiedID] -- == 0)
{
lock(classifiedCache)
{
lock(classifiedInterest)
{
classifiedInterest.Remove(queryClassifiedID);
}
classifiedCache.Remove(queryClassifiedID);
}
}
}
lock(classifiedInterest)
classifiedInterest[queryClassifiedID] --;
if(classifiedInterest[queryClassifiedID] == 0)
{
lock(classifiedInterest)
classifiedInterest.Remove(queryClassifiedID);
lock(classifiedCache)
classifiedCache.Remove(queryClassifiedID);
}
}
string serverURI = string.Empty;
bool foreign = GetUserProfileServerURI(target, out serverURI);