From d4a4aafaf15360c0f5db22145a60bae87e6bb9c6 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 5 Oct 2007 13:54:16 +0000
Subject: * So, ok, maybe renaming serialized fields on a friday wasn't the
 smartest of things. Reverting 2056.

---
 OpenSim/Framework/Data.MySQL/MySQLManager.cs  | 34 +++++++++++++--------------
 OpenSim/Framework/Data.MySQL/MySQLUserData.cs |  6 ++---
 2 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'OpenSim/Framework/Data.MySQL')

diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index e733a83..a83ee45 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -313,36 +313,36 @@ namespace OpenSim.Framework.Data.MySQL
             if (reader.Read())
             {
                 retval.UUID = new LLUUID((string)reader["UUID"]);
-                retval.Firstname = (string)reader["username"];
-                retval.Lastname = (string)reader["lastname"];
+                retval.username = (string)reader["username"];
+                retval.surname = (string)reader["lastname"];
 
-                retval.PasswordHash = (string)reader["passwordHash"];
-                retval.PasswordSalt = (string)reader["passwordSalt"];
+                retval.passwordHash = (string)reader["passwordHash"];
+                retval.passwordSalt = (string)reader["passwordSalt"];
 
-                retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
-                retval.HomeLocation = new LLVector3(
+                retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
+                retval.homeLocation = new LLVector3(
                     Convert.ToSingle(reader["homeLocationX"].ToString()),
                     Convert.ToSingle(reader["homeLocationY"].ToString()),
                     Convert.ToSingle(reader["homeLocationZ"].ToString()));
-                retval.HomeLookAt = new LLVector3(
+                retval.homeLookAt = new LLVector3(
                     Convert.ToSingle(reader["homeLookAtX"].ToString()),
                     Convert.ToSingle(reader["homeLookAtY"].ToString()),
                     Convert.ToSingle(reader["homeLookAtZ"].ToString()));
 
-                retval.Created = Convert.ToInt32(reader["created"].ToString());
-                retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
+                retval.created = Convert.ToInt32(reader["created"].ToString());
+                retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
 
-                retval.UserInventoryUri = (string)reader["userInventoryURI"];
-                retval.UserAssetUri = (string)reader["userAssetURI"];
+                retval.userInventoryURI = (string)reader["userInventoryURI"];
+                retval.userAssetURI = (string)reader["userAssetURI"];
 
-                retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
-                retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
+                retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
+                retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
 
-                retval.ProfileAboutText = (string)reader["profileAboutText"];
-                retval.ProfileFirstText = (string)reader["profileFirstText"];
+                retval.profileAboutText = (string)reader["profileAboutText"];
+                retval.profileFirstText = (string)reader["profileFirstText"];
 
-                retval.ProfileImage = new LLUUID((string)reader["profileImage"]);
-                retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
+                retval.profileImage = new LLUUID((string)reader["profileImage"]);
+                retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
 
             }
             else
diff --git a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
index ae24367..301550f 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLUserData.cs
@@ -204,9 +204,9 @@ namespace OpenSim.Framework.Data.MySQL
                {
                    lock (database)
                    {
-                       database.insertUserRow(user.UUID, user.Firstname, user.Lastname, user.PasswordHash, user.PasswordSalt, user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z,
-                           user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryUri, user.UserAssetUri, user.ProfileCanDoMask, user.ProfileWantDoMask,
-                           user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage);
+                       database.insertUserRow(user.UUID, user.username, user.surname, user.passwordHash, user.passwordSalt, user.homeRegion, user.homeLocation.X, user.homeLocation.Y, user.homeLocation.Z,
+                           user.homeLookAt.X, user.homeLookAt.Y, user.homeLookAt.Z, user.created, user.lastLogin, user.userInventoryURI, user.userAssetURI, user.profileCanDoMask, user.profileWantDoMask,
+                           user.profileAboutText, user.profileFirstText, user.profileImage, user.profileFirstImage);
                    }
                }
                catch (Exception e)
-- 
cgit v1.1