aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Data.MySQL/MySQLManager.cs
diff options
context:
space:
mode:
authorlbsa712007-10-05 13:54:16 +0000
committerlbsa712007-10-05 13:54:16 +0000
commitd4a4aafaf15360c0f5db22145a60bae87e6bb9c6 (patch)
tree72915aa8a9f3777a52fe8677c764a192d448e492 /OpenSim/Framework/Data.MySQL/MySQLManager.cs
parent* minor refactoring (diff)
downloadopensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.zip
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.gz
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.bz2
opensim-SC-d4a4aafaf15360c0f5db22145a60bae87e6bb9c6.tar.xz
* So, ok, maybe renaming serialized fields on a friday wasn't the smartest of things. Reverting 2056.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs34
1 files changed, 17 insertions, 17 deletions
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
313 if (reader.Read()) 313 if (reader.Read())
314 { 314 {
315 retval.UUID = new LLUUID((string)reader["UUID"]); 315 retval.UUID = new LLUUID((string)reader["UUID"]);
316 retval.Firstname = (string)reader["username"]; 316 retval.username = (string)reader["username"];
317 retval.Lastname = (string)reader["lastname"]; 317 retval.surname = (string)reader["lastname"];
318 318
319 retval.PasswordHash = (string)reader["passwordHash"]; 319 retval.passwordHash = (string)reader["passwordHash"];
320 retval.PasswordSalt = (string)reader["passwordSalt"]; 320 retval.passwordSalt = (string)reader["passwordSalt"];
321 321
322 retval.HomeRegion = Convert.ToUInt64(reader["homeRegion"].ToString()); 322 retval.homeRegion = Convert.ToUInt64(reader["homeRegion"].ToString());
323 retval.HomeLocation = new LLVector3( 323 retval.homeLocation = new LLVector3(
324 Convert.ToSingle(reader["homeLocationX"].ToString()), 324 Convert.ToSingle(reader["homeLocationX"].ToString()),
325 Convert.ToSingle(reader["homeLocationY"].ToString()), 325 Convert.ToSingle(reader["homeLocationY"].ToString()),
326 Convert.ToSingle(reader["homeLocationZ"].ToString())); 326 Convert.ToSingle(reader["homeLocationZ"].ToString()));
327 retval.HomeLookAt = new LLVector3( 327 retval.homeLookAt = new LLVector3(
328 Convert.ToSingle(reader["homeLookAtX"].ToString()), 328 Convert.ToSingle(reader["homeLookAtX"].ToString()),
329 Convert.ToSingle(reader["homeLookAtY"].ToString()), 329 Convert.ToSingle(reader["homeLookAtY"].ToString()),
330 Convert.ToSingle(reader["homeLookAtZ"].ToString())); 330 Convert.ToSingle(reader["homeLookAtZ"].ToString()));
331 331
332 retval.Created = Convert.ToInt32(reader["created"].ToString()); 332 retval.created = Convert.ToInt32(reader["created"].ToString());
333 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); 333 retval.lastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
334 334
335 retval.UserInventoryUri = (string)reader["userInventoryURI"]; 335 retval.userInventoryURI = (string)reader["userInventoryURI"];
336 retval.UserAssetUri = (string)reader["userAssetURI"]; 336 retval.userAssetURI = (string)reader["userAssetURI"];
337 337
338 retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 338 retval.profileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
339 retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 339 retval.profileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
340 340
341 retval.ProfileAboutText = (string)reader["profileAboutText"]; 341 retval.profileAboutText = (string)reader["profileAboutText"];
342 retval.ProfileFirstText = (string)reader["profileFirstText"]; 342 retval.profileFirstText = (string)reader["profileFirstText"];
343 343
344 retval.ProfileImage = new LLUUID((string)reader["profileImage"]); 344 retval.profileImage = new LLUUID((string)reader["profileImage"]);
345 retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]); 345 retval.profileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
346 346
347 } 347 }
348 else 348 else