aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2013-06-06 03:04:47 +0100
committerMelanie2013-06-06 03:04:47 +0100
commitea9e1d1a1e0da0bab23d899b29672a0e7c7d8ad0 (patch)
tree876269c05bbc4be96ee8bdff2970cdfea0db61bc /OpenSim/Server
parentMerge branch 'master' into careminster (diff)
parentPrevent processing for Npc (diff)
downloadopensim-SC_OLD-ea9e1d1a1e0da0bab23d899b29672a0e7c7d8ad0.zip
opensim-SC_OLD-ea9e1d1a1e0da0bab23d899b29672a0e7c7d8ad0.tar.gz
opensim-SC_OLD-ea9e1d1a1e0da0bab23d899b29672a0e7c7d8ad0.tar.bz2
opensim-SC_OLD-ea9e1d1a1e0da0bab23d899b29672a0e7c7d8ad0.tar.xz
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs5
1 files changed, 0 insertions, 5 deletions
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
106 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate); 106 Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
107 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate); 107 Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
108 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest); 108 Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
109// Server.AddJsonRPCHandler("user_preferences_request", handler.UserPreferencesRequest);
110// Server.AddJsonRPCHandler("user_preferences_update", handler.UserPreferencesUpdate);
111// Server.AddJsonRPCHandler("user_account_create", handler.UserAccountCreate);
112// Server.AddJsonRPCHandler("user_account_auth", handler.UserAccountAuth);
113// Server.AddJsonRPCHandler("user_account_test", handler.UserAccountTest);
114 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData); 109 Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
115 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); 110 Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
116 } 111 }