renaming of attributes in UserAgentData for readability

3 files changed, 19 insertions, 19 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index 524efc4..e3179f7 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -366,11 +366,11 @@ namespace OpenSim.Data.MSSQL
                 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
 
                 // Current position
-                retval.CurrentRegion = (string)reader["currentRegion"];
-                retval.CurrentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
+                retval.Region = (string)reader["currentRegion"];
+                retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
                 LLVector3 tmp_v;
                 LLVector3.TryParse((string)reader["currentPos"], out tmp_v);
-                retval.CurrentPos = tmp_v;
+                retval.Position = tmp_v;
 
             }
             else
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index f2ec6be..38f56c4 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -427,11 +427,11 @@ namespace OpenSim.Data.MySQL
                 retval.LogoutTime = Convert.ToInt32(reader["logoutTime"].ToString());
 
                 // Current position
-                retval.CurrentRegion = new LLUUID((string)reader["currentRegion"]);
-                retval.CurrentHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
+                retval.Region = new LLUUID((string)reader["currentRegion"]);
+                retval.Handle = Convert.ToUInt64(reader["currentHandle"].ToString());
                 LLVector3 tmp_v;
                 LLVector3.TryParse((string) reader["currentPos"], out tmp_v);
-                retval.CurrentPos = tmp_v;
+                retval.Position = tmp_v;
             }
             else
             {
@@ -915,9 +915,9 @@ namespace OpenSim.Data.MySQL
             parameters["?agentOnline"] = (agentdata.AgentOnline == true) ? "1" : "0";
             parameters["?loginTime"] = agentdata.LoginTime.ToString();
             parameters["?logoutTime"] = agentdata.LogoutTime.ToString();
-            parameters["?currentRegion"] = agentdata.CurrentRegion.ToString();
-            parameters["?currentHandle"] = agentdata.CurrentHandle.ToString();
-            parameters["?currentPos"] = "<" + ((int)agentdata.CurrentPos.X).ToString() + "," + ((int)agentdata.CurrentPos.Y).ToString() + "," + ((int)agentdata.CurrentPos.Z).ToString() + ">";
+            parameters["?currentRegion"] = agentdata.Region.ToString();
+            parameters["?currentHandle"] = agentdata.Handle.ToString();
+            parameters["?currentPos"] = "<" + ((int)agentdata.Position.X).ToString() + "," + ((int)agentdata.Position.Y).ToString() + "," + ((int)agentdata.Position.Z).ToString() + ">";
 
             bool returnval = false;
 
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 3ee0c03..089c9df 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -680,12 +680,12 @@ namespace OpenSim.Data.SQLite
             ua.AgentOnline = Convert.ToBoolean(row["agentOnline"]);
             ua.SessionID = new LLUUID((String) row["sessionID"]);
             ua.SecureSessionID = new LLUUID((String) row["secureSessionID"]);
-            ua.RegionID = new LLUUID((String) row["regionID"]);
+            ua.InitialRegion = new LLUUID((String) row["regionID"]);
             ua.LoginTime = Convert.ToInt32(row["loginTime"]);
             ua.LogoutTime = Convert.ToInt32(row["logoutTime"]);
-            ua.CurrentRegion = new LLUUID((String) row["currentRegion"]);
-            ua.CurrentHandle = Convert.ToUInt64(row["currentHandle"]);
-            ua.CurrentPos = new LLVector3(
+            ua.Region = new LLUUID((String) row["currentRegion"]);
+            ua.Handle = Convert.ToUInt64(row["currentHandle"]);
+            ua.Position = new LLVector3(
                 Convert.ToSingle(row["currentPosX"]),
                 Convert.ToSingle(row["currentPosY"]),
                 Convert.ToSingle(row["currentPosZ"])
@@ -701,15 +701,15 @@ namespace OpenSim.Data.SQLite
             row["agentOnline"] = ua.AgentOnline;
             row["sessionID"] = ua.SessionID;
             row["secureSessionID"] = ua.SecureSessionID;
-            row["regionID"] = ua.RegionID;
+            row["regionID"] = ua.InitialRegion;
             row["loginTime"] = ua.LoginTime;
             row["logoutTime"] = ua.LogoutTime;
-            row["currentRegion"] = ua.CurrentRegion;
-            row["currentHandle"] = ua.CurrentHandle.ToString();
+            row["currentRegion"] = ua.Region;
+            row["currentHandle"] = ua.Handle.ToString();
             // vectors
-            row["currentPosX"] = ua.CurrentPos.X;
-            row["currentPosY"] = ua.CurrentPos.Y;
-            row["currentPosZ"] = ua.CurrentPos.Z;
+            row["currentPosX"] = ua.Position.X;
+            row["currentPosY"] = ua.Position.Y;
+            row["currentPosZ"] = ua.Position.Z;
         }
 
         /***********************************************************************