aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/DB4o
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/DB4o')
-rw-r--r--OpenSim/Data/DB4o/DB4oManager.cs12
-rw-r--r--OpenSim/Data/DB4o/DB4oUserData.cs8
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
125 IObjectSet result = database.Get(typeof (UserProfileData)); 125 IObjectSet result = database.Get(typeof (UserProfileData));
126 foreach (UserProfileData row in result) 126 foreach (UserProfileData row in result)
127 { 127 {
128 if (userProfiles.ContainsKey(row.UUID)) 128 if (userProfiles.ContainsKey(row.Id))
129 userProfiles[row.UUID] = row; 129 userProfiles[row.Id] = row;
130 else 130 else
131 userProfiles.Add(row.UUID, row); 131 userProfiles.Add(row.Id, row);
132 } 132 }
133 database.Close(); 133 database.Close();
134 } 134 }
@@ -145,13 +145,13 @@ namespace OpenSim.Data.DB4o
145 /// <returns>true on success, false on fail to persist to db</returns> 145 /// <returns>true on success, false on fail to persist to db</returns>
146 public bool UpdateRecord(UserProfileData record) 146 public bool UpdateRecord(UserProfileData record)
147 { 147 {
148 if (userProfiles.ContainsKey(record.UUID)) 148 if (userProfiles.ContainsKey(record.Id))
149 { 149 {
150 userProfiles[record.UUID] = record; 150 userProfiles[record.Id] = record;
151 } 151 }
152 else 152 else
153 { 153 {
154 userProfiles.Add(record.UUID, record); 154 userProfiles.Add(record.Id, record);
155 } 155 }
156 156
157 try 157 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
85 { 85 {
86 foreach (UserProfileData profile in manager.userProfiles.Values) 86 foreach (UserProfileData profile in manager.userProfiles.Values)
87 { 87 {
88 if (profile.username == fname && profile.surname == lname) 88 if (profile.FirstName == fname && profile.SurName == lname)
89 return profile; 89 return profile;
90 } 90 }
91 return null; 91 return null;
@@ -100,7 +100,7 @@ namespace OpenSim.Data.DB4o
100 { 100 {
101 try 101 try
102 { 102 {
103 return GetUserByUUID(uuid).currentAgent; 103 return GetUserByUUID(uuid).CurrentAgent;
104 } 104 }
105 catch (Exception) 105 catch (Exception)
106 { 106 {
@@ -128,7 +128,7 @@ namespace OpenSim.Data.DB4o
128 { 128 {
129 try 129 try
130 { 130 {
131 return GetUserByName(fname, lname).currentAgent; 131 return GetUserByName(fname, lname).CurrentAgent;
132 } 132 }
133 catch (Exception) 133 catch (Exception)
134 { 134 {
@@ -138,7 +138,7 @@ namespace OpenSim.Data.DB4o
138 public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 138 public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
139 { 139 {
140 UserProfileData user = GetUserByUUID(AgentID); 140 UserProfileData user = GetUserByUUID(AgentID);
141 user.webLoginKey = WebLoginKey; 141 user.WebLoginKey = WebLoginKey;
142 UpdateUserProfile(user); 142 UpdateUserProfile(user);
143 143
144 } 144 }