2 files changed, 3 insertions, 6 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 13f0167..a97c9b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -62,7 +62,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
         // count. The entries are removed when the interest count reaches 0.
         Dictionary<UUID,UUID> classifiedCache = new Dictionary<UUID, UUID>();
         Dictionary<UUID,int> classifiedInterest = new Dictionary<UUID, int>();
-        Object classifiedLock;
 
         public Scene Scene
         {
@@ -170,6 +169,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
 
         void HandleOnMakeRootAgent (ScenePresence obj)
         {
+            if(obj.PresenceType == PresenceType.Npc)
+                return;
+
             GetImageAssets(((IScenePresence)obj).UUID);
         }
 
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 5a24ee3..f9a520a 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -106,11 +106,6 @@ namespace OpenSim.Server.Handlers.Profiles
             Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
             Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
             Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
-//            Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
-//            Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferencesUpdate);
-//            Server.AddJsonRPCHandler("user_account_create", handler.UserAccountCreate);
-//            Server.AddJsonRPCHandler("user_account_auth", handler.UserAccountAuth);
-//            Server.AddJsonRPCHandler("user_account_test", handler.UserAccountTest);
             Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
             Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
         }