aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
diff options
context:
space:
mode:
authorMelanie2013-12-07 01:19:20 +0000
committerMelanie2013-12-07 01:19:20 +0000
commitba48816fb676d17298e03e82579fc4f54fa48800 (patch)
treecfa25ad1116eb0f7bd42eb2d2ebecf19eae939e8 /OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.zip
opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.gz
opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.bz2
opensim-SC-ba48816fb676d17298e03e82579fc4f54fa48800.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
index 28dbbc2..6403882 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -104,6 +104,8 @@ namespace OpenSim.Server.Handlers.Profiles
104 Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest); 104 Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
105 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate); 105 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
106 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate); 106 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
107 Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
108 Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
107 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest); 109 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
108 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData); 110 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
109 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); 111 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);