diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 44 |
2 files changed, 46 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index f8aa0f1..810c24e 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -127,6 +127,8 @@ namespace OpenSim.Grid.UserServer | |||
127 | m_httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); | 127 | m_httpServer.AddXmlRPCHandler("remove_user_friend", m_userManager.XmlRpcResponseXmlRPCRemoveUserFriend); |
128 | m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); | 128 | m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms); |
129 | m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); | 129 | m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList); |
130 | m_httpServer.AddXmlRPCHandler("get_avatar_appearance", m_userManager.XmlRPCGetAvatarAppearance); | ||
131 | m_httpServer.AddXmlRPCHandler("update_avatar_appearance", m_userManager.XmlRPCUpdateAvatarAppearance); | ||
130 | m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID); | 132 | m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID); |
131 | 133 | ||
132 | // Message Server ---> User Server | 134 | // Message Server ---> User Server |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 8372d6a..63e77cf 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -247,6 +247,50 @@ namespace OpenSim.Grid.UserServer | |||
247 | return FriendListItemListtoXmlRPCResponse(returndata); | 247 | return FriendListItemListtoXmlRPCResponse(returndata); |
248 | } | 248 | } |
249 | 249 | ||
250 | public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request) | ||
251 | { | ||
252 | XmlRpcResponse response = new XmlRpcResponse(); | ||
253 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
254 | AvatarAppearance appearance = null; | ||
255 | Hashtable responseData = null; | ||
256 | if (requestData.Contains("owner")) | ||
257 | { | ||
258 | appearance = GetUserAppearance(new LLUUID((string)requestData["owner"])); | ||
259 | responseData = appearance.ToHashTable(); | ||
260 | } | ||
261 | else | ||
262 | { | ||
263 | responseData = new Hashtable(); | ||
264 | responseData["error_type"] = "unknown_avatar"; | ||
265 | responseData["error_desc"] = "The avatar appearance requested is not in the database"; | ||
266 | } | ||
267 | |||
268 | response.Value = responseData; | ||
269 | return response; | ||
270 | } | ||
271 | |||
272 | public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request) | ||
273 | { | ||
274 | XmlRpcResponse response = new XmlRpcResponse(); | ||
275 | Hashtable requestData = (Hashtable)request.Params[0]; | ||
276 | Hashtable responseData = null; | ||
277 | if (requestData.Contains("owner")) | ||
278 | { | ||
279 | AvatarAppearance appearance = new AvatarAppearance(requestData); | ||
280 | UpdateUserAppearance(new LLUUID((string)requestData["owner"]), appearance); | ||
281 | responseData = new Hashtable(); | ||
282 | responseData["returnString"] = "TRUE"; | ||
283 | } | ||
284 | else | ||
285 | { | ||
286 | responseData = new Hashtable(); | ||
287 | responseData["error_type"] = "unknown_avatar"; | ||
288 | responseData["error_desc"] = "The avatar appearance requested is not in the database"; | ||
289 | } | ||
290 | response.Value = responseData; | ||
291 | return response; | ||
292 | } | ||
293 | |||
250 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) | 294 | public XmlRpcResponse XmlRPCGetUserMethodName(XmlRpcRequest request) |
251 | { | 295 | { |
252 | XmlRpcResponse response = new XmlRpcResponse(); | 296 | XmlRpcResponse response = new XmlRpcResponse(); |