Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere.

1 files changed, 8 insertions, 8 deletions

diff --git a/OpenSim/Services/UserAccountService/UserGridService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 2d28b33..36cce75 100644
--- a/OpenSim/Services/UserAccountService/UserGridService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -39,20 +39,20 @@ using log4net;
 
 namespace OpenSim.Services.UserAccountService
 {
-    public class UserGridService : UserGridServiceBase, IUserGridService
+    public class GridUserService : GridUserServiceBase, IGridUserService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public UserGridService(IConfigSource config) : base(config) 
+        public GridUserService(IConfigSource config) : base(config) 
         {
             m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
         }
 
-        public UserGridInfo GetUserGridInfo(string userID)
+        public GridUserInfo GetGridUserInfo(string userID)
         {
-            UserGridData d = m_Database.GetUserGridData(userID);
+            GridUserData d = m_Database.GetGridUserData(userID);
             
-            UserGridInfo info = new UserGridInfo();
+            GridUserInfo info = new GridUserInfo();
             info.UserID = d.UserID;
             info.HomeRegionID = new UUID(d.Data["HomeRegionID"]);
             info.HomePosition = Vector3.Parse(d.Data["HomePosition"]);
@@ -61,16 +61,16 @@ namespace OpenSim.Services.UserAccountService
             return info;            
         }
         
-        public bool StoreUserGridInfo(UserGridInfo info)
+        public bool StoreGridUserInfo(GridUserInfo info)
         {
-            UserGridData d = new UserGridData();
+            GridUserData d = new GridUserData();
 
             d.Data["UserID"] = info.UserID;
             d.Data["HomeRegionID"] = info.HomeRegionID.ToString();
             d.Data["HomePosition"] = info.HomePosition.ToString();
             d.Data["HomeLookAt"] = info.HomeLookAt.ToString();
 
-            return m_Database.StoreUserGridData(d);
+            return m_Database.StoreGridUserData(d);
         }
     }
 }
\ No newline at end of file