aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorUbitUmarov2015-09-28 15:49:22 +0100
committerUbitUmarov2015-09-28 15:49:22 +0100
commit6ded1da9f20a83399d075956e11e953c01321b00 (patch)
tree47f17611f2b540a189799db33f219d716aedc74f /OpenSim/Server
parent clear merge issue (diff)
downloadopensim-SC-6ded1da9f20a83399d075956e11e953c01321b00.zip
opensim-SC-6ded1da9f20a83399d075956e11e953c01321b00.tar.gz
opensim-SC-6ded1da9f20a83399d075956e11e953c01321b00.tar.bz2
opensim-SC-6ded1da9f20a83399d075956e11e953c01321b00.tar.xz
... merge issue
Diffstat (limited to 'OpenSim/Server')
-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 9afe953..2dfb862 100644
--- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -99,6 +99,8 @@ namespace OpenSim.Server.Handlers.Profiles
99 Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest); 99 Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
100 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate); 100 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
101 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate); 101 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
102 Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferenecesUpdate);
103 Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
102 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest); 104 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
103 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData); 105 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
104 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); 106 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);