From 3507005d9decdbf579fb2b7b9928a7d97bd6cf5b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 31 Dec 2009 01:16:16 +0000
Subject: Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.
 Implement the fetch operations fully. Rename one last UserService file to
 UserAccountService

---
 .../UserAccounts/UserAccountServerPostHandler.cs   | 25 +++-------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

(limited to 'OpenSim/Server/Handlers')

diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index a92148c..544ffea 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -85,10 +85,8 @@ namespace OpenSim.Server.Handlers.UserAccounts
                         return GetAccount(request);
                     case "getaccounts":
                         return GetAccounts(request);
-                    case "createaccount":
-                        return CreateAccount(request);
                     case "setaccount":
-                        return SetAccount(request);
+                        return StoreAccount(request);
                 }
                 m_log.DebugFormat("[PRESENCE HANDLER]: unknown method request: {0}", method);
             }
@@ -174,24 +172,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
             return encoding.GetBytes(xmlString);
         }
 
-        byte[] CreateAccount(Dictionary<string, object> request)
-        {
-            if (!request.ContainsKey("account"))
-                return FailureResult();
-            if (request["account"] == null)
-                return FailureResult();
-            if (!(request["account"] is Dictionary<string, object>))
-                return FailureResult();
-
-            UserAccount account = new UserAccount((Dictionary<string, object>) request["account"]);
-
-            if (m_UserAccountService.CreateUserAccount(account))
-                return SuccessResult();
-
-            return FailureResult();
-        }
-
-        byte[] SetAccount(Dictionary<string, object> request)
+        byte[] StoreAccount(Dictionary<string, object> request)
         {
             if (!request.ContainsKey("account"))
                 return FailureResult();
@@ -202,7 +183,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
 
             UserAccount account = new UserAccount((Dictionary<string, object>)request["account"]);
 
-            if (m_UserAccountService.SetUserAccount(account))
+            if (m_UserAccountService.StoreUserAccount(account))
                 return SuccessResult();
 
             return FailureResult();
-- 
cgit v1.1