Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster

1 files changed, 18 insertions, 14 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 5b228ee..a97c9b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -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(classifiedInterest)
+                    classifiedInterest[queryClassifiedID] --;
+
+                if(classifiedInterest[queryClassifiedID] == 0)
                 {
+                    lock(classifiedInterest)
+                        classifiedInterest.Remove(queryClassifiedID);
                     lock(classifiedCache)
-                    {
-                        lock(classifiedInterest)
-                        {
-                            classifiedInterest.Remove(queryClassifiedID);
-                        }
                         classifiedCache.Remove(queryClassifiedID);
-                    }
                 }
-            }            
-
+            }
             
             string serverURI = string.Empty;
             bool foreign = GetUserProfileServerURI(target, out serverURI);