Finish the renaming and mae things compile again

2 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Services/UserService/UserService.cs b/OpenSim/Services/UserService/UserService.cs
index cfbc2c1..78793657 100644
--- a/OpenSim/Services/UserService/UserService.cs
+++ b/OpenSim/Services/UserService/UserService.cs
@@ -33,41 +33,41 @@ using OpenSim.Services.Interfaces;
 using System.Collections.Generic;
 using OpenMetaverse;
 
-namespace OpenSim.Services.UserService
+namespace OpenSim.Services.UserAccountService
 {
-    public class UserService : UserServiceBase, IUserDataService
+    public class UserAccountService : UserAccountServiceBase, IUserAccountDataService
     {
-        public UserService(IConfigSource config) : base(config)
+        public UserAccountService(IConfigSource config) : base(config)
         {
         }
 
-        public UserData GetUserData(UUID scopeID, string firstName,
+        public UserAccountData GetUserAccountData(UUID scopeID, string firstName,
                 string lastName)
         {
             return null;
         }
 
-        public UserData GetUserData(UUID scopeID, UUID userID)
+        public UserAccountData GetUserAccountData(UUID scopeID, UUID userID)
         {
             return null;
         }
 
-        public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret)
+        public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret)
         {
             return false;
         }
 
-        public bool SetUserData(UserData data, UUID principalID, UUID sessionID)
+        public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
         {
             return false;
         }
 
-        public bool CreateUserData(UserData data, UUID principalID, UUID sessionID)
+        public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
         {
             return false;
         }
 
-        public List<UserData> GetAvatarPickerData(UUID scopeID,
+        public List<UserAccountData> GetUserAccountData(UUID scopeID,
                 string query)
         {
             return null;
diff --git a/OpenSim/Services/UserService/UserServiceBase.cs b/OpenSim/Services/UserService/UserServiceBase.cs
index 5139e50..c982c1a 100644
--- a/OpenSim/Services/UserService/UserServiceBase.cs
+++ b/OpenSim/Services/UserService/UserServiceBase.cs
@@ -32,17 +32,17 @@ using OpenSim.Data;
 using OpenSim.Services.Interfaces;
 using OpenSim.Services.Base;
 
-namespace OpenSim.Services.UserService
+namespace OpenSim.Services.UserAccountService
 {
-    public class UserServiceBase: ServiceBase
+    public class UserAccountServiceBase: ServiceBase
     {
         protected IUserDataPlugin m_Database = null;
 
-        public UserServiceBase(IConfigSource config) : base(config)
+        public UserAccountServiceBase(IConfigSource config) : base(config)
         {
-            IConfig userConfig = config.Configs["UserService"];
+            IConfig userConfig = config.Configs["UserAccountService"];
             if (userConfig == null)
-                throw new Exception("No UserService configuration");
+                throw new Exception("No UserAccountService configuration");
 
             string dllName = userConfig.GetString("StorageProvider",
                     String.Empty);