aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
diff options
context:
space:
mode:
authordahlia2013-12-06 15:58:51 -0800
committerdahlia2013-12-06 15:58:51 -0800
commitaba2a444538fc0ab5ae093004dc9994abab299e3 (patch)
tree21b1dc7790e08ba8de07c073dd7b6186ce10d938 /OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
parentuse System.IO.Compression.DeflateStream for mesh decompression in an attempt ... (diff)
parentAdd support for user preferences (im via email) (diff)
downloadopensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.zip
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.gz
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.bz2
opensim-SC-aba2a444538fc0ab5ae093004dc9994abab299e3.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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);