6 files changed, 42 insertions, 42 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
index c8703ee..0924de7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private IUserDataService m_UserService;
+        private IUserAccountDataService m_UserService;
 
         private bool m_Enabled = false;
 
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 
                     Object[] args = new Object[] { source };
                     m_UserService =
-                            ServerUtils.LoadPlugin<IUserDataService>(serviceDll,
+                            ServerUtils.LoadPlugin<IUserAccountDataService>(serviceDll,
                             args);
 
                     if (m_UserService == null)
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
             if (!m_Enabled)
                 return;
 
-            scene.RegisterModuleInterface<IUserDataService>(m_UserService);
+            scene.RegisterModuleInterface<IUserAccountDataService>(m_UserService);
         }
 
         public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
index 41d360f..abf8c4f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
@@ -37,7 +37,7 @@ using OpenSim.Services.Connectors;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 {
     public class RemoteUserServicesConnector : UserServicesConnector,
-            ISharedRegionModule, IUserDataService
+            ISharedRegionModule, IUserAccountDataService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
             if (!m_Enabled)
                 return;
 
-            scene.RegisterModuleInterface<IUserDataService>(this);
+            scene.RegisterModuleInterface<IUserAccountDataService>(this);
         }
 
         public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
index 12afb29..fb03844 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Services/Connectors/User/UserServiceConnector.cs
@@ -39,7 +39,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Services.Connectors
 {
-    public class UserServicesConnector : IUserDataService
+    public class UserServicesConnector : IUserAccountDataService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -81,10 +81,10 @@ namespace OpenSim.Services.Connectors
             m_ServerURI = serviceURI;
         }
 
-        public UserData GetUserData(UUID scopeID, string firstName, string lastName)
+        public UserAccountData GetUserAccountData(UUID scopeID, string firstName, string lastName)
         {
             string uri = m_ServerURI + "/users/";
-            UserData data = new UserData();
+            UserAccountData data = new UserAccountData();
             data.FirstName = firstName;
             data.LastName = lastName;
             data.ScopeID = scopeID;
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 data = SynchronousRestObjectRequester.
-                        MakeRequest<UserData, UserData>("POST", uri, data);
+                        MakeRequest<UserAccountData, UserAccountData>("POST", uri, data);
             }
             catch (Exception e)
             {
@@ -107,10 +107,10 @@ namespace OpenSim.Services.Connectors
             return data;
         }
 
-        public UserData GetUserData(UUID scopeID, UUID userID)
+        public UserAccountData GetUserAccountData(UUID scopeID, UUID userID)
         {
             string uri = m_ServerURI + "/users/";
-            UserData data = new UserData();
+            UserAccountData data = new UserAccountData();
             data.FirstName = String.Empty;
             data.LastName = String.Empty;
             data.ScopeID = scopeID;
@@ -119,7 +119,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 data = SynchronousRestObjectRequester.
-                        MakeRequest<UserData, UserData>("POST", uri, data);
+                        MakeRequest<UserAccountData, UserAccountData>("POST", uri, data);
             }
             catch (Exception e)
             {
@@ -133,12 +133,12 @@ namespace OpenSim.Services.Connectors
             return data;
         }
 
-        public bool SetHomePosition(UserData data, UUID regionID, UUID regionSecret)
+        public bool SetHomePosition(UserAccountData data, UUID regionID, UUID regionSecret)
         {
             string uri = m_ServerURI + "/user/";
             bool result = false;
 
-            UserDataMessage msg = new UserDataMessage();
+            UserAccountDataMessage msg = new UserAccountDataMessage();
 
             msg.Data = data;
             msg.RegionID = regionID;
@@ -147,7 +147,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 result = SynchronousRestObjectRequester.
-                        MakeRequest<UserDataMessage, bool>("POST", uri, msg);
+                        MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
             }
             catch (Exception e)
             {
@@ -158,12 +158,12 @@ namespace OpenSim.Services.Connectors
             return result;
         }
 
-        public bool SetUserData(UserData data, UUID principalID, UUID sessionID)
+        public bool SetUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
         {
             string uri = m_ServerURI + "/user/";
             bool result = false;
 
-            UserDataMessage msg = new UserDataMessage();
+            UserAccountDataMessage msg = new UserAccountDataMessage();
 
             msg.Data = data;
             msg.PrincipalID = principalID;
@@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 result = SynchronousRestObjectRequester.
-                        MakeRequest<UserDataMessage, bool>("POST", uri, msg);
+                        MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
             }
             catch (Exception e)
             {
@@ -183,12 +183,12 @@ namespace OpenSim.Services.Connectors
             return result;
         }
 
-        public bool CreateUserData(UserData data, UUID principalID, UUID sessionID)
+        public bool CreateUserAccountData(UserAccountData data, UUID principalID, UUID sessionID)
         {
             string uri = m_ServerURI + "/newuser/";
             bool result = false;
 
-            UserDataMessage msg = new UserDataMessage();
+            UserAccountDataMessage msg = new UserAccountDataMessage();
 
             msg.Data = data;
             msg.PrincipalID = principalID;
@@ -197,7 +197,7 @@ namespace OpenSim.Services.Connectors
             try
             {
                 result = SynchronousRestObjectRequester.
-                        MakeRequest<UserDataMessage, bool>("POST", uri, msg);
+                        MakeRequest<UserAccountDataMessage, bool>("POST", uri, msg);
             }
             catch (Exception e)
             {
@@ -208,18 +208,18 @@ namespace OpenSim.Services.Connectors
             return result;
         }
 
-        public List<UserData> GetAvatarPickerData(UUID scopeID, string query)
+        public List<UserAccountData> GetUserAccountData(UUID scopeID, string query)
         {
             string uri = m_ServerURI + "/userlist/";
-            UserData data = new UserData();
+            UserAccountData data = new UserAccountData();
             data.FirstName = query;
             data.ScopeID = scopeID;
-            List<UserData> result;
+            List<UserAccountData> result;
 
             try
             {
                 result = SynchronousRestObjectRequester.
-                        MakeRequest<UserData, List<UserData>>("POST", uri, data);
+                        MakeRequest<UserAccountData, List<UserAccountData>>("POST", uri, data);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Interfaces/IUserService.cs b/OpenSim/Services/Interfaces/IUserService.cs
index 8ea207a..35254a1 100644
--- a/OpenSim/Services/Interfaces/IUserService.cs
+++ b/OpenSim/Services/Interfaces/IUserService.cs
@@ -32,11 +32,11 @@ namespace OpenSim.Services.Interfaces
 {
     public class UserAccountData
     {
-        public UserData()
+        public UserAccountData()
         {
         }
 
-        public UserData(UUID userID, UUID homeRegionID, float homePositionX,
+        public UserAccountData(UUID userID, UUID homeRegionID, float homePositionX,
                 float homePositionY, float homePositionZ, float homeLookAtX,
                 float homeLookAtY, float homeLookAtZ)
         {
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
 
     public class UserAccountDataMessage
     {
-        public UserData Data;
+        public UserAccountData Data;
 
         // Set to the region's ID and secret when updating home location
         //
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);