moved fields to properties for UserDataProfile, which was

actually a little more work than I expected given the copious
use of out params.

2 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Data/DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs
index d9085c5..13bd61c 100644
--- a/OpenSim/Data/DB4o/DB4oManager.cs
+++ b/OpenSim/Data/DB4o/DB4oManager.cs
@@ -125,10 +125,10 @@ namespace OpenSim.Data.DB4o
             IObjectSet result = database.Get(typeof (UserProfileData));
             foreach (UserProfileData row in result)
             {
-                if (userProfiles.ContainsKey(row.UUID))
-                    userProfiles[row.UUID] = row;
+                if (userProfiles.ContainsKey(row.Id))
+                    userProfiles[row.Id] = row;
                 else
-                    userProfiles.Add(row.UUID, row);
+                    userProfiles.Add(row.Id, row);
             }
             database.Close();
         }
@@ -145,13 +145,13 @@ namespace OpenSim.Data.DB4o
         /// <returns>true on success, false on fail to persist to db</returns>
         public bool UpdateRecord(UserProfileData record)
         {
-            if (userProfiles.ContainsKey(record.UUID))
+            if (userProfiles.ContainsKey(record.Id))
             {
-                userProfiles[record.UUID] = record;
+                userProfiles[record.Id] = record;
             }
             else
             {
-                userProfiles.Add(record.UUID, record);
+                userProfiles.Add(record.Id, record);
             }
 
             try
diff --git a/OpenSim/Data/DB4o/DB4oUserData.cs b/OpenSim/Data/DB4o/DB4oUserData.cs
index 62671e3..d0108ab 100644
--- a/OpenSim/Data/DB4o/DB4oUserData.cs
+++ b/OpenSim/Data/DB4o/DB4oUserData.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Data.DB4o
         {
             foreach (UserProfileData profile in manager.userProfiles.Values)
             {
-                if (profile.username == fname && profile.surname == lname)
+                if (profile.FirstName == fname && profile.SurName == lname)
                     return profile;
             }
             return null;
@@ -100,7 +100,7 @@ namespace OpenSim.Data.DB4o
         {
             try
             {
-                return GetUserByUUID(uuid).currentAgent;
+                return GetUserByUUID(uuid).CurrentAgent;
             }
             catch (Exception)
             {
@@ -128,7 +128,7 @@ namespace OpenSim.Data.DB4o
         {
             try
             {
-                return GetUserByName(fname, lname).currentAgent;
+                return GetUserByName(fname, lname).CurrentAgent;
             }
             catch (Exception)
             {
@@ -138,7 +138,7 @@ namespace OpenSim.Data.DB4o
         public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
         {
             UserProfileData user = GetUserByUUID(AgentID);
-            user.webLoginKey = WebLoginKey;
+            user.WebLoginKey = WebLoginKey;
             UpdateUserProfile(user);
 
         }