aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-04-10 14:09:30 +0000
committerSean Dague2008-04-10 14:09:30 +0000
commit25fea01b92a7682e10f57ce979217d31fee975ef (patch)
tree0e0dec2344cd06609bf47f1a7e2245a0a94f99c6
parentmoved fields to properties for UserDataProfile, which was (diff)
downloadopensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.zip
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.gz
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.bz2
opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.xz
further renaming of properties for clarity
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/DB4o/DB4oManager.cs12
-rw-r--r--OpenSim/Data/MSSQL/MSSQLManager.cs14
-rw-r--r--OpenSim/Data/MSSQL/MSSQLUserData.cs26
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs22
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs16
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs36
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs10
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs6
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs10
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs18
-rw-r--r--OpenSim/Framework/UserProfileData.cs146
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs8
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs22
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs10
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs4
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs24
-rw-r--r--OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs20
19 files changed, 205 insertions, 205 deletions
diff --git a/OpenSim/Data/DB4o/DB4oManager.cs b/OpenSim/Data/DB4o/DB4oManager.cs
index 13bd61c..a9368d5 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.Id)) 128 if (userProfiles.ContainsKey(row.ID))
129 userProfiles[row.Id] = row; 129 userProfiles[row.ID] = row;
130 else 130 else
131 userProfiles.Add(row.Id, 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.Id)) 148 if (userProfiles.ContainsKey(record.ID))
149 { 149 {
150 userProfiles[record.Id] = record; 150 userProfiles[record.ID] = record;
151 } 151 }
152 else 152 else
153 { 153 {
154 userProfiles.Add(record.Id, record); 154 userProfiles.Add(record.ID, record);
155 } 155 }
156 156
157 try 157 try
diff --git a/OpenSim/Data/MSSQL/MSSQLManager.cs b/OpenSim/Data/MSSQL/MSSQLManager.cs
index e33468a..e327c46 100644
--- a/OpenSim/Data/MSSQL/MSSQLManager.cs
+++ b/OpenSim/Data/MSSQL/MSSQLManager.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Data.MSSQL
300 300
301 if (reader.Read()) 301 if (reader.Read())
302 { 302 {
303 retval.Id = new LLUUID((string)reader["UUID"]); 303 retval.ID = new LLUUID((string)reader["UUID"]);
304 retval.FirstName = (string)reader["username"]; 304 retval.FirstName = (string)reader["username"];
305 retval.SurName = (string)reader["lastname"]; 305 retval.SurName = (string)reader["lastname"];
306 306
@@ -323,14 +323,14 @@ namespace OpenSim.Data.MSSQL
323 retval.UserInventoryURI = (string)reader["userInventoryURI"]; 323 retval.UserInventoryURI = (string)reader["userInventoryURI"];
324 retval.UserAssetURI = (string)reader["userAssetURI"]; 324 retval.UserAssetURI = (string)reader["userAssetURI"];
325 325
326 retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 326 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
327 retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 327 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
328 328
329 retval.ProfileAboutText = (string)reader["profileAboutText"]; 329 retval.AboutText = (string)reader["profileAboutText"];
330 retval.ProfileFirstText = (string)reader["profileFirstText"]; 330 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
331 331
332 retval.ProfileImage = new LLUUID((string)reader["profileImage"]); 332 retval.Image = new LLUUID((string)reader["profileImage"]);
333 retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]); 333 retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
334 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); 334 retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
335 } 335 }
336 else 336 else
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index aae0095..3d4cabf 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -453,7 +453,7 @@ namespace OpenSim.Data.MSSQL
453 override public UserAgentData GetAgentByName(string user, string last) 453 override public UserAgentData GetAgentByName(string user, string last)
454 { 454 {
455 UserProfileData profile = GetUserByName(user, last); 455 UserProfileData profile = GetUserByName(user, last);
456 return GetAgentByUUID(profile.Id); 456 return GetAgentByUUID(profile.ID);
457 } 457 }
458 458
459 /// <summary> 459 /// <summary>
@@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
505 { 505 {
506 lock (database) 506 lock (database)
507 { 507 {
508 InsertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, 508 InsertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
509 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, 509 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
510 user.HomeLocation.Z, 510 user.HomeLocation.Z,
511 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, 511 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
512 user.LastLogin, user.UserInventoryURI, user.UserAssetURI, 512 user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
513 user.ProfileCanDoMask, user.ProfileWantDoMask, 513 user.CanDoMask, user.WantDoMask,
514 user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, 514 user.AboutText, user.FirstLifeAboutText, user.Image,
515 user.ProfileFirstImage, user.WebLoginKey); 515 user.FirstLifeImage, user.WebLoginKey);
516 } 516 }
517 } 517 }
518 catch (Exception e) 518 catch (Exception e)
@@ -651,7 +651,7 @@ namespace OpenSim.Data.MSSQL
651 "profileFirstImage = @profileFirstImage, " + 651 "profileFirstImage = @profileFirstImage, " +
652 "webLoginKey = @webLoginKey where " + 652 "webLoginKey = @webLoginKey where " +
653 "UUID = @keyUUUID;", database.getConnection()); 653 "UUID = @keyUUUID;", database.getConnection());
654 SqlParameter param1 = new SqlParameter("@uuid", user.Id.ToString()); 654 SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
655 SqlParameter param2 = new SqlParameter("@username", user.FirstName); 655 SqlParameter param2 = new SqlParameter("@username", user.FirstName);
656 SqlParameter param3 = new SqlParameter("@lastname", user.SurName); 656 SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
657 SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash); 657 SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
@@ -667,13 +667,13 @@ namespace OpenSim.Data.MSSQL
667 SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin)); 667 SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
668 SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI); 668 SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
669 SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI); 669 SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
670 SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.ProfileCanDoMask)); 670 SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.CanDoMask));
671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask)); 671 SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText); 672 SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText); 673 SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
674 SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString()); 674 SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString()); 675 SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
676 SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.ToString()); 676 SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
677 SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString()); 677 SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
678 command.Parameters.Add(param1); 678 command.Parameters.Add(param1);
679 command.Parameters.Add(param2); 679 command.Parameters.Add(param2);
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index 110f192..f4ef172 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -431,7 +431,7 @@ namespace OpenSim.Data.MySQL
431 if (!LLUUID.TryParse((string)reader["UUID"], out id)) 431 if (!LLUUID.TryParse((string)reader["UUID"], out id))
432 return null; 432 return null;
433 433
434 retval.Id = id; 434 retval.ID = id;
435 retval.FirstName = (string) reader["username"]; 435 retval.FirstName = (string) reader["username"];
436 retval.SurName = (string) reader["lastname"]; 436 retval.SurName = (string) reader["lastname"];
437 437
@@ -454,33 +454,33 @@ namespace OpenSim.Data.MySQL
454 retval.UserInventoryURI = (string) reader["userInventoryURI"]; 454 retval.UserInventoryURI = (string) reader["userInventoryURI"];
455 retval.UserAssetURI = (string) reader["userAssetURI"]; 455 retval.UserAssetURI = (string) reader["userAssetURI"];
456 456
457 retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); 457 retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
458 retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); 458 retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
459 459
460 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) 460 if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
461 retval.ProfileAboutText = ""; 461 retval.AboutText = "";
462 else 462 else
463 retval.ProfileAboutText = (string) reader["profileAboutText"]; 463 retval.AboutText = (string) reader["profileAboutText"];
464 464
465 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) 465 if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
466 retval.ProfileFirstText = ""; 466 retval.FirstLifeAboutText = "";
467 else 467 else
468 retval.ProfileFirstText = (string)reader["profileFirstText"]; 468 retval.FirstLifeAboutText = (string)reader["profileFirstText"];
469 469
470 if (reader.IsDBNull(reader.GetOrdinal("profileImage"))) 470 if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
471 retval.ProfileImage = LLUUID.Zero; 471 retval.Image = LLUUID.Zero;
472 else { 472 else {
473 LLUUID tmp; 473 LLUUID tmp;
474 LLUUID.TryParse((string)reader["profileImage"], out tmp); 474 LLUUID.TryParse((string)reader["profileImage"], out tmp);
475 retval.ProfileImage = tmp; 475 retval.Image = tmp;
476 } 476 }
477 477
478 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage"))) 478 if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
479 retval.ProfileFirstImage = LLUUID.Zero; 479 retval.FirstLifeImage = LLUUID.Zero;
480 else { 480 else {
481 LLUUID tmp; 481 LLUUID tmp;
482 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); 482 LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
483 retval.ProfileFirstImage = tmp; 483 retval.FirstLifeImage = tmp;
484 } 484 }
485 485
486 if(reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) 486 if(reader.IsDBNull(reader.GetOrdinal("webLoginKey")))
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 5654207..5b2dc76 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
475 override public UserAgentData GetAgentByName(string user, string last) 475 override public UserAgentData GetAgentByName(string user, string last)
476 { 476 {
477 UserProfileData profile = GetUserByName(user, last); 477 UserProfileData profile = GetUserByName(user, last);
478 return GetAgentByUUID(profile.Id); 478 return GetAgentByUUID(profile.ID);
479 } 479 }
480 480
481 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) 481 override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
@@ -547,14 +547,14 @@ namespace OpenSim.Data.MySQL
547 { 547 {
548 lock (database) 548 lock (database)
549 { 549 {
550 database.insertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, 550 database.insertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
551 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, 551 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
552 user.HomeLocation.Z, 552 user.HomeLocation.Z,
553 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, 553 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
554 user.LastLogin, user.UserInventoryURI, user.UserAssetURI, 554 user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
555 user.ProfileCanDoMask, user.ProfileWantDoMask, 555 user.CanDoMask, user.WantDoMask,
556 user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, 556 user.AboutText, user.FirstLifeAboutText, user.Image,
557 user.ProfileFirstImage, user.WebLoginKey); 557 user.FirstLifeImage, user.WebLoginKey);
558 } 558 }
559 } 559 }
560 catch (Exception e) 560 catch (Exception e)
@@ -590,11 +590,11 @@ namespace OpenSim.Data.MySQL
590 /// <param name="user">The profile data to use to update the DB</param> 590 /// <param name="user">The profile data to use to update the DB</param>
591 override public bool UpdateUserProfile(UserProfileData user) 591 override public bool UpdateUserProfile(UserProfileData user)
592 { 592 {
593 database.updateUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, 593 database.updateUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
594 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X, 594 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X,
595 user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI, 595 user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI,
596 user.UserAssetURI, user.ProfileCanDoMask, user.ProfileWantDoMask, user.ProfileAboutText, 596 user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
597 user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage, user.WebLoginKey); 597 user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey);
598 return true; 598 return true;
599 } 599 }
600 600
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index e395565..815c1bb 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
135 if (rows.Length > 0) 135 if (rows.Length > 0)
136 { 136 {
137 UserProfileData user = buildUserProfile(rows[0]); 137 UserProfileData user = buildUserProfile(rows[0]);
138 DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.Id)); 138 DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.ID));
139 if (row != null) 139 if (row != null)
140 { 140 {
141 user.CurrentAgent = buildUserAgent(row); 141 user.CurrentAgent = buildUserAgent(row);
@@ -365,7 +365,7 @@ namespace OpenSim.Data.SQLite
365 DataTable users = ds.Tables["users"]; 365 DataTable users = ds.Tables["users"];
366 lock (ds) 366 lock (ds)
367 { 367 {
368 DataRow row = users.Rows.Find(Util.ToRawUuidString(user.Id)); 368 DataRow row = users.Rows.Find(Util.ToRawUuidString(user.ID));
369 if (row == null) 369 if (row == null)
370 { 370 {
371 row = users.NewRow(); 371 row = users.NewRow();
@@ -384,7 +384,7 @@ namespace OpenSim.Data.SQLite
384 if (user.CurrentAgent != null) 384 if (user.CurrentAgent != null)
385 { 385 {
386 DataTable ua = ds.Tables["useragents"]; 386 DataTable ua = ds.Tables["useragents"];
387 row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); 387 row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
388 if (row == null) 388 if (row == null)
389 { 389 {
390 row = ua.NewRow(); 390 row = ua.NewRow();
@@ -401,7 +401,7 @@ namespace OpenSim.Data.SQLite
401 // I just added this to help the standalone login situation. 401 // I just added this to help the standalone login situation.
402 //It still needs to be looked at by a Database guy 402 //It still needs to be looked at by a Database guy
403 DataTable ua = ds.Tables["useragents"]; 403 DataTable ua = ds.Tables["useragents"];
404 row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); 404 row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
405 405
406 if (row == null) 406 if (row == null)
407 { 407 {
@@ -593,7 +593,7 @@ namespace OpenSim.Data.SQLite
593 UserProfileData user = new UserProfileData(); 593 UserProfileData user = new UserProfileData();
594 LLUUID tmp; 594 LLUUID tmp;
595 LLUUID.TryParse((String)row["UUID"], out tmp); 595 LLUUID.TryParse((String)row["UUID"], out tmp);
596 user.Id = tmp; 596 user.ID = tmp;
597 user.FirstName = (String) row["username"]; 597 user.FirstName = (String) row["username"];
598 user.SurName = (String) row["surname"]; 598 user.SurName = (String) row["surname"];
599 user.PasswordHash = (String) row["passwordHash"]; 599 user.PasswordHash = (String) row["passwordHash"];
@@ -616,14 +616,14 @@ namespace OpenSim.Data.SQLite
616 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 616 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
617 user.UserInventoryURI = (String) row["userInventoryURI"]; 617 user.UserInventoryURI = (String) row["userInventoryURI"];
618 user.UserAssetURI = (String) row["userAssetURI"]; 618 user.UserAssetURI = (String) row["userAssetURI"];
619 user.ProfileCanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 619 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
620 user.ProfileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); 620 user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
621 user.ProfileAboutText = (String) row["profileAboutText"]; 621 user.AboutText = (String) row["profileAboutText"];
622 user.ProfileFirstText = (String) row["profileFirstText"]; 622 user.FirstLifeAboutText = (String) row["profileFirstText"];
623 LLUUID.TryParse((String)row["profileImage"], out tmp); 623 LLUUID.TryParse((String)row["profileImage"], out tmp);
624 user.ProfileImage = tmp; 624 user.Image = tmp;
625 LLUUID.TryParse((String)row["profileFirstImage"], out tmp); 625 LLUUID.TryParse((String)row["profileFirstImage"], out tmp);
626 user.ProfileFirstImage = tmp; 626 user.FirstLifeImage = tmp;
627 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); 627 user.WebLoginKey = new LLUUID((String) row["webLoginKey"]);
628 628
629 return user; 629 return user;
@@ -631,7 +631,7 @@ namespace OpenSim.Data.SQLite
631 631
632 private void fillUserRow(DataRow row, UserProfileData user) 632 private void fillUserRow(DataRow row, UserProfileData user)
633 { 633 {
634 row["UUID"] = Util.ToRawUuidString(user.Id); 634 row["UUID"] = Util.ToRawUuidString(user.ID);
635 row["username"] = user.FirstName; 635 row["username"] = user.FirstName;
636 row["surname"] = user.SurName; 636 row["surname"] = user.SurName;
637 row["passwordHash"] = user.PasswordHash; 637 row["passwordHash"] = user.PasswordHash;
@@ -652,12 +652,12 @@ namespace OpenSim.Data.SQLite
652 row["rootInventoryFolderID"] = user.RootInventoryFolderID; 652 row["rootInventoryFolderID"] = user.RootInventoryFolderID;
653 row["userInventoryURI"] = user.UserInventoryURI; 653 row["userInventoryURI"] = user.UserInventoryURI;
654 row["userAssetURI"] = user.UserAssetURI; 654 row["userAssetURI"] = user.UserAssetURI;
655 row["profileCanDoMask"] = user.ProfileCanDoMask; 655 row["profileCanDoMask"] = user.CanDoMask;
656 row["profileWantDoMask"] = user.ProfileWantDoMask; 656 row["profileWantDoMask"] = user.WantDoMask;
657 row["profileAboutText"] = user.ProfileAboutText; 657 row["profileAboutText"] = user.AboutText;
658 row["profileFirstText"] = user.ProfileFirstText; 658 row["profileFirstText"] = user.FirstLifeAboutText;
659 row["profileImage"] = user.ProfileImage; 659 row["profileImage"] = user.Image;
660 row["profileFirstImage"] = user.ProfileFirstImage; 660 row["profileFirstImage"] = user.FirstLifeImage;
661 row["webLoginKey"] = user.WebLoginKey; 661 row["webLoginKey"] = user.WebLoginKey;
662 662
663 // ADO.NET doesn't handle NULL very well 663 // ADO.NET doesn't handle NULL very well
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 75fe1aa..6e07e7c 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Framework.Communications.Cache
114// "[INVENTORY CACHE]: Received folder {0} {1} for user {2}", 114// "[INVENTORY CACHE]: Received folder {0} {1} for user {2}",
115// folderInfo.name, folderInfo.folderID, userID); 115// folderInfo.name, folderInfo.folderID, userID);
116 116
117 if (userID == UserProfile.Id) 117 if (userID == UserProfile.ID)
118 { 118 {
119 if (RootFolder == null) 119 if (RootFolder == null)
120 { 120 {
@@ -169,7 +169,7 @@ namespace OpenSim.Framework.Communications.Cache
169 /// <param name="folderInfo"></param> 169 /// <param name="folderInfo"></param>
170 public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) 170 public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
171 { 171 {
172 if ((userID == UserProfile.Id) && (RootFolder != null)) 172 if ((userID == UserProfile.ID) && (RootFolder != null))
173 { 173 {
174 if (itemInfo.Folder == RootFolder.ID) 174 if (itemInfo.Folder == RootFolder.ID)
175 { 175 {
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Communications.Cache
194 194
195 public void AddItem(LLUUID userID, InventoryItemBase itemInfo) 195 public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
196 { 196 {
197 if ((userID == UserProfile.Id) && (RootFolder != null)) 197 if ((userID == UserProfile.ID) && (RootFolder != null))
198 { 198 {
199 ItemReceive(userID, itemInfo); 199 ItemReceive(userID, itemInfo);
200 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 200 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Communications.Cache
203 203
204 public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo) 204 public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo)
205 { 205 {
206 if ((userID == UserProfile.Id) && (RootFolder != null)) 206 if ((userID == UserProfile.ID) && (RootFolder != null))
207 { 207 {
208 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 208 m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
209 } 209 }
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Cache
212 public bool DeleteItem(LLUUID userID, InventoryItemBase item) 212 public bool DeleteItem(LLUUID userID, InventoryItemBase item)
213 { 213 {
214 bool result = false; 214 bool result = false;
215 if ((userID == UserProfile.Id) && (RootFolder != null)) 215 if ((userID == UserProfile.ID) && (RootFolder != null))
216 { 216 {
217 result = RootFolder.DeleteItem(item.ID); 217 result = RootFolder.DeleteItem(item.ID);
218 if (result) 218 if (result)
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 6b01d8f..192c8e3 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications
164 } 164 }
165 else 165 else
166 { 166 {
167 m_inventoryService.CreateNewUserInventory(userProf.Id); 167 m_inventoryService.CreateNewUserInventory(userProf.ID);
168 m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName); 168 m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
169 return userProf.Id; 169 return userProf.ID;
170 } 170 }
171 } 171 }
172 172
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Communications
249 UserProfileData profileData = m_userService.GetUserProfile(uuid); 249 UserProfileData profileData = m_userService.GetUserProfile(uuid);
250 if (profileData != null) 250 if (profileData != null)
251 { 251 {
252 LLUUID profileId = profileData.Id; 252 LLUUID profileId = profileData.ID;
253 string firstname = profileData.FirstName; 253 string firstname = profileData.FirstName;
254 string lastname = profileData.SurName; 254 string lastname = profileData.SurName;
255 255
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e5ad7a0..4f314bc 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.UserManagement
207 207
208 try 208 try
209 { 209 {
210 LLUUID agentID = userProfile.Id; 210 LLUUID agentID = userProfile.ID;
211 211
212 // Inventory Library Section 212 // Inventory Library Section
213 InventoryData inventData = GetInventorySkeleton(agentID); 213 InventoryData inventData = GetInventorySkeleton(agentID);
@@ -349,7 +349,7 @@ namespace OpenSim.Framework.UserManagement
349 349
350 try 350 try
351 { 351 {
352 LLUUID agentID = userProfile.Id; 352 LLUUID agentID = userProfile.ID;
353 353
354 // Inventory Library Section 354 // Inventory Library Section
355 InventoryData inventData = GetInventorySkeleton(agentID); 355 InventoryData inventData = GetInventorySkeleton(agentID);
@@ -491,7 +491,7 @@ namespace OpenSim.Framework.UserManagement
491 if (goodweblogin) 491 if (goodweblogin)
492 { 492 {
493 LLUUID webloginkey = LLUUID.Random(); 493 LLUUID webloginkey = LLUUID.Random();
494 m_userManager.StoreWebLoginKey(user.Id, webloginkey); 494 m_userManager.StoreWebLoginKey(user.ID, webloginkey);
495 statuscode = 301; 495 statuscode = 301;
496 496
497 string redirectURL = "about:blank?redirect-http-hack=" + 497 string redirectURL = "about:blank?redirect-http-hack=" +
@@ -639,7 +639,7 @@ namespace OpenSim.Framework.UserManagement
639 public virtual bool AuthenticateUser(UserProfileData profile, string password) 639 public virtual bool AuthenticateUser(UserProfileData profile, string password)
640 { 640 {
641 bool passwordSuccess = false; 641 bool passwordSuccess = false;
642 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); 642 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
643 643
644 // Web Login method seems to also occasionally send the hashed password itself 644 // Web Login method seems to also occasionally send the hashed password itself
645 645
@@ -664,7 +664,7 @@ namespace OpenSim.Framework.UserManagement
664 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) 664 public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey)
665 { 665 {
666 bool passwordSuccess = false; 666 bool passwordSuccess = false;
667 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); 667 m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
668 668
669 // Match web login key unless it's the default weblogin key LLUUID.Zero 669 // Match web login key unless it's the default weblogin key LLUUID.Zero
670 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero); 670 passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero);
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 02be6bd..91c284c 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement
96 96
97 if (profile != null) 97 if (profile != null)
98 { 98 {
99 profile.CurrentAgent = getUserAgent(profile.Id); 99 profile.CurrentAgent = getUserAgent(profile.ID);
100 return profile; 100 return profile;
101 } 101 }
102 } 102 }
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.UserManagement
113 113
114 if (null != profile) 114 if (null != profile)
115 { 115 {
116 profile.CurrentAgent = getUserAgent(profile.Id); 116 profile.CurrentAgent = getUserAgent(profile.ID);
117 return profile; 117 return profile;
118 } 118 }
119 } 119 }
@@ -355,7 +355,7 @@ namespace OpenSim.Framework.UserManagement
355 agent.sessionID = new LLUUID(randDataS, 0); 355 agent.sessionID = new LLUUID(randDataS, 0);
356 356
357 // Profile UUID 357 // Profile UUID
358 agent.UUID = profile.Id; 358 agent.UUID = profile.ID;
359 359
360 // Current position (from Home) 360 // Current position (from Home)
361 agent.currentHandle = profile.HomeRegion; 361 agent.currentHandle = profile.HomeRegion;
@@ -481,7 +481,7 @@ namespace OpenSim.Framework.UserManagement
481 agent.sessionID = new LLUUID(randDataS, 0); 481 agent.sessionID = new LLUUID(randDataS, 0);
482 482
483 // Profile UUID 483 // Profile UUID
484 agent.UUID = profile.Id; 484 agent.UUID = profile.ID;
485 485
486 // Current position (from Home) 486 // Current position (from Home)
487 agent.currentHandle = profile.HomeRegion; 487 agent.currentHandle = profile.HomeRegion;
@@ -523,7 +523,7 @@ namespace OpenSim.Framework.UserManagement
523 { 523 {
524 UserProfileData user = new UserProfileData(); 524 UserProfileData user = new UserProfileData();
525 user.HomeLocation = new LLVector3(128, 128, 100); 525 user.HomeLocation = new LLVector3(128, 128, 100);
526 user.Id = LLUUID.Random(); 526 user.ID = LLUUID.Random();
527 user.FirstName = firstName; 527 user.FirstName = firstName;
528 user.SurName = lastName; 528 user.SurName = lastName;
529 user.PasswordHash = pass; 529 user.PasswordHash = pass;
@@ -545,14 +545,14 @@ namespace OpenSim.Framework.UserManagement
545 } 545 }
546 } 546 }
547 547
548 return user.Id; 548 return user.ID;
549 } 549 }
550 550
551 public bool UpdateUserProfileProperties(UserProfileData UserProfile) 551 public bool UpdateUserProfileProperties(UserProfileData UserProfile)
552 { 552 {
553 if (null == GetUserProfile(UserProfile.Id)) 553 if (null == GetUserProfile(UserProfile.ID))
554 { 554 {
555 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.Id.ToString()); 555 m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
556 return false; 556 return false;
557 } 557 }
558 foreach (KeyValuePair<string, IUserData> plugin in _plugins) 558 foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@@ -563,7 +563,7 @@ namespace OpenSim.Framework.UserManagement
563 } 563 }
564 catch (Exception e) 564 catch (Exception e)
565 { 565 {
566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.Id.ToString() 566 m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
567 + " via " + plugin.Key + "(" + e.ToString() + ")"); 567 + " via " + plugin.Key + "(" + e.ToString() + ")");
568 return false; 568 return false;
569 } 569 }
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 016dc8d..73c9137 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -43,42 +43,42 @@ namespace OpenSim.Framework
43 /// <summary> 43 /// <summary>
44 /// The last used Web_login_key 44 /// The last used Web_login_key
45 /// </summary> 45 /// </summary>
46 private LLUUID webLoginKey; 46 private LLUUID _webLoginKey;
47 /// <summary> 47 /// <summary>
48 /// The first component of a users account name 48 /// The first component of a users account name
49 /// </summary> 49 /// </summary>
50 private string username; 50 private string _firstname;
51 51
52 /// <summary> 52 /// <summary>
53 /// The second component of a users account name 53 /// The second component of a users account name
54 /// </summary> 54 /// </summary>
55 private string surname; 55 private string _surname;
56 56
57 /// <summary> 57 /// <summary>
58 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) 58 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
59 /// </summary> 59 /// </summary>
60 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> 60 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
61 private string passwordHash; 61 private string _passwordHash;
62 62
63 /// <summary> 63 /// <summary>
64 /// The salt used for the users hash, should be 32 bytes or longer 64 /// The salt used for the users hash, should be 32 bytes or longer
65 /// </summary> 65 /// </summary>
66 private string passwordSalt; 66 private string _passwordSalt;
67 67
68 /// <summary> 68 /// <summary>
69 /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into 69 /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
70 /// </summary> 70 /// </summary>
71 public ulong HomeRegion 71 public ulong HomeRegion
72 { 72 {
73 get { return Helpers.UIntsToLong((homeRegionX * (uint)Constants.RegionSize), (homeRegionY * (uint)Constants.RegionSize)); } 73 get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); }
74 set 74 set
75 { 75 {
76 homeRegionX = (uint) (value >> 40); 76 _homeRegionX = (uint) (value >> 40);
77 homeRegionY = (((uint) (value)) >> 8); 77 _homeRegionY = (((uint) (value)) >> 8);
78 } 78 }
79 } 79 }
80 80
81 public LLUUID Id { 81 public LLUUID ID {
82 get { 82 get {
83 return _id; 83 return _id;
84 } 84 }
@@ -89,261 +89,261 @@ namespace OpenSim.Framework
89 89
90 public LLUUID WebLoginKey { 90 public LLUUID WebLoginKey {
91 get { 91 get {
92 return webLoginKey; 92 return _webLoginKey;
93 } 93 }
94 set { 94 set {
95 webLoginKey = value; 95 _webLoginKey = value;
96 } 96 }
97 } 97 }
98 98
99 public string FirstName { 99 public string FirstName {
100 get { 100 get {
101 return username; 101 return _firstname;
102 } 102 }
103 set { 103 set {
104 username = value; 104 _firstname = value;
105 } 105 }
106 } 106 }
107 107
108 public string SurName { 108 public string SurName {
109 get { 109 get {
110 return surname; 110 return _surname;
111 } 111 }
112 set { 112 set {
113 surname = value; 113 _surname = value;
114 } 114 }
115 } 115 }
116 116
117 public string PasswordHash { 117 public string PasswordHash {
118 get { 118 get {
119 return passwordHash; 119 return _passwordHash;
120 } 120 }
121 set { 121 set {
122 passwordHash = value; 122 _passwordHash = value;
123 } 123 }
124 } 124 }
125 125
126 public string PasswordSalt { 126 public string PasswordSalt {
127 get { 127 get {
128 return passwordSalt; 128 return _passwordSalt;
129 } 129 }
130 set { 130 set {
131 passwordSalt = value; 131 _passwordSalt = value;
132 } 132 }
133 } 133 }
134 134
135 public uint HomeRegionX { 135 public uint HomeRegionX {
136 get { 136 get {
137 return homeRegionX; 137 return _homeRegionX;
138 } 138 }
139 set { 139 set {
140 homeRegionX = value; 140 _homeRegionX = value;
141 } 141 }
142 } 142 }
143 143
144 public uint HomeRegionY { 144 public uint HomeRegionY {
145 get { 145 get {
146 return homeRegionY; 146 return _homeRegionY;
147 } 147 }
148 set { 148 set {
149 homeRegionY = value; 149 _homeRegionY = value;
150 } 150 }
151 } 151 }
152 152
153 public LLVector3 HomeLocation { 153 public LLVector3 HomeLocation {
154 get { 154 get {
155 return homeLocation; 155 return _homeLocation;
156 } 156 }
157 set { 157 set {
158 homeLocation = value; 158 _homeLocation = value;
159 } 159 }
160 } 160 }
161 161
162 public LLVector3 HomeLookAt { 162 public LLVector3 HomeLookAt {
163 get { 163 get {
164 return homeLookAt; 164 return _homeLookAt;
165 } 165 }
166 set { 166 set {
167 homeLookAt = value; 167 _homeLookAt = value;
168 } 168 }
169 } 169 }
170 170
171 public int Created { 171 public int Created {
172 get { 172 get {
173 return created; 173 return _created;
174 } 174 }
175 set { 175 set {
176 created = value; 176 _created = value;
177 } 177 }
178 } 178 }
179 179
180 public int LastLogin { 180 public int LastLogin {
181 get { 181 get {
182 return lastLogin; 182 return _lastLogin;
183 } 183 }
184 set { 184 set {
185 lastLogin = value; 185 _lastLogin = value;
186 } 186 }
187 } 187 }
188 188
189 public LLUUID RootInventoryFolderID { 189 public LLUUID RootInventoryFolderID {
190 get { 190 get {
191 return rootInventoryFolderID; 191 return _rootInventoryFolderID;
192 } 192 }
193 set { 193 set {
194 rootInventoryFolderID = value; 194 _rootInventoryFolderID = value;
195 } 195 }
196 } 196 }
197 197
198 public string UserInventoryURI { 198 public string UserInventoryURI {
199 get { 199 get {
200 return userInventoryURI; 200 return _userInventoryURI;
201 } 201 }
202 set { 202 set {
203 userInventoryURI = value; 203 _userInventoryURI = value;
204 } 204 }
205 } 205 }
206 206
207 public string UserAssetURI { 207 public string UserAssetURI {
208 get { 208 get {
209 return userAssetURI; 209 return _userAssetURI;
210 } 210 }
211 set { 211 set {
212 userAssetURI = value; 212 _userAssetURI = value;
213 } 213 }
214 } 214 }
215 215
216 public uint ProfileCanDoMask { 216 public uint CanDoMask {
217 get { 217 get {
218 return profileCanDoMask; 218 return _profileCanDoMask;
219 } 219 }
220 set { 220 set {
221 profileCanDoMask = value; 221 _profileCanDoMask = value;
222 } 222 }
223 } 223 }
224 224
225 public uint ProfileWantDoMask { 225 public uint WantDoMask {
226 get { 226 get {
227 return profileWantDoMask; 227 return _profileWantDoMask;
228 } 228 }
229 set { 229 set {
230 profileWantDoMask = value; 230 _profileWantDoMask = value;
231 } 231 }
232 } 232 }
233 233
234 public string ProfileAboutText { 234 public string AboutText {
235 get { 235 get {
236 return profileAboutText; 236 return _profileAboutText;
237 } 237 }
238 set { 238 set {
239 profileAboutText = value; 239 _profileAboutText = value;
240 } 240 }
241 } 241 }
242 242
243 public string ProfileFirstText { 243 public string FirstLifeAboutText {
244 get { 244 get {
245 return profileFirstText; 245 return _profileFirstText;
246 } 246 }
247 set { 247 set {
248 profileFirstText = value; 248 _profileFirstText = value;
249 } 249 }
250 } 250 }
251 251
252 public LLUUID ProfileImage { 252 public LLUUID Image {
253 get { 253 get {
254 return profileImage; 254 return _profileImage;
255 } 255 }
256 set { 256 set {
257 profileImage = value; 257 _profileImage = value;
258 } 258 }
259 } 259 }
260 260
261 public LLUUID ProfileFirstImage { 261 public LLUUID FirstLifeImage {
262 get { 262 get {
263 return profileFirstImage; 263 return _profileFirstImage;
264 } 264 }
265 set { 265 set {
266 profileFirstImage = value; 266 _profileFirstImage = value;
267 } 267 }
268 } 268 }
269 269
270 public UserAgentData CurrentAgent { 270 public UserAgentData CurrentAgent {
271 get { 271 get {
272 return currentAgent; 272 return _currentAgent;
273 } 273 }
274 set { 274 set {
275 currentAgent = value; 275 _currentAgent = value;
276 } 276 }
277 } 277 }
278 278
279 private uint homeRegionX; 279 private uint _homeRegionX;
280 private uint homeRegionY; 280 private uint _homeRegionY;
281 281
282 /// <summary> 282 /// <summary>
283 /// The coordinates inside the region of the home location 283 /// The coordinates inside the region of the home location
284 /// </summary> 284 /// </summary>
285 private LLVector3 homeLocation; 285 private LLVector3 _homeLocation;
286 286
287 /// <summary> 287 /// <summary>
288 /// Where the user will be looking when they rez. 288 /// Where the user will be looking when they rez.
289 /// </summary> 289 /// </summary>
290 private LLVector3 homeLookAt; 290 private LLVector3 _homeLookAt;
291 291
292 /// <summary> 292 /// <summary>
293 /// A UNIX Timestamp (seconds since epoch) for the users creation 293 /// A UNIX Timestamp (seconds since epoch) for the users creation
294 /// </summary> 294 /// </summary>
295 private int created; 295 private int _created;
296 296
297 /// <summary> 297 /// <summary>
298 /// A UNIX Timestamp for the users last login date / time 298 /// A UNIX Timestamp for the users last login date / time
299 /// </summary> 299 /// </summary>
300 private int lastLogin; 300 private int _lastLogin;
301 301
302 private LLUUID rootInventoryFolderID; 302 private LLUUID _rootInventoryFolderID;
303 303
304 /// <summary> 304 /// <summary>
305 /// A URI to the users inventory server, used for foreigners and large grids 305 /// A URI to the users inventory server, used for foreigners and large grids
306 /// </summary> 306 /// </summary>
307 private string userInventoryURI = String.Empty; 307 private string _userInventoryURI = String.Empty;
308 308
309 /// <summary> 309 /// <summary>
310 /// A URI to the users asset server, used for foreigners and large grids. 310 /// A URI to the users asset server, used for foreigners and large grids.
311 /// </summary> 311 /// </summary>
312 private string userAssetURI = String.Empty; 312 private string _userAssetURI = String.Empty;
313 313
314 /// <summary> 314 /// <summary>
315 /// A uint mask containing the "I can do" fields of the users profile 315 /// A uint mask containing the "I can do" fields of the users profile
316 /// </summary> 316 /// </summary>
317 private uint profileCanDoMask; 317 private uint _profileCanDoMask;
318 318
319 /// <summary> 319 /// <summary>
320 /// A uint mask containing the "I want to do" part of the users profile 320 /// A uint mask containing the "I want to do" part of the users profile
321 /// </summary> 321 /// </summary>
322 private uint profileWantDoMask; // Profile window "I want to" mask 322 private uint _profileWantDoMask; // Profile window "I want to" mask
323 323
324 /// <summary> 324 /// <summary>
325 /// The about text listed in a users profile. 325 /// The about text listed in a users profile.
326 /// </summary> 326 /// </summary>
327 private string profileAboutText = String.Empty; 327 private string _profileAboutText = String.Empty;
328 328
329 /// <summary> 329 /// <summary>
330 /// The first life about text listed in a users profile 330 /// The first life about text listed in a users profile
331 /// </summary> 331 /// </summary>
332 private string profileFirstText = String.Empty; 332 private string _profileFirstText = String.Empty;
333 333
334 /// <summary> 334 /// <summary>
335 /// The profile image for an avatar stored on the asset server 335 /// The profile image for an avatar stored on the asset server
336 /// </summary> 336 /// </summary>
337 private LLUUID profileImage; 337 private LLUUID _profileImage;
338 338
339 /// <summary> 339 /// <summary>
340 /// The profile image for the users first life tab 340 /// The profile image for the users first life tab
341 /// </summary> 341 /// </summary>
342 private LLUUID profileFirstImage; 342 private LLUUID _profileFirstImage;
343 343
344 /// <summary> 344 /// <summary>
345 /// The users last registered agent (filled in on the user server) 345 /// The users last registered agent (filled in on the user server)
346 /// </summary> 346 /// </summary>
347 private UserAgentData currentAgent; 347 private UserAgentData _currentAgent;
348 } 348 }
349} 349}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index f655415..141aa3e 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Grid.UserServer
177 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); 177 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
178 SimParams["firstname"] = theUser.FirstName; 178 SimParams["firstname"] = theUser.FirstName;
179 SimParams["lastname"] = theUser.SurName; 179 SimParams["lastname"] = theUser.SurName;
180 SimParams["agent_id"] = theUser.Id.ToString(); 180 SimParams["agent_id"] = theUser.ID.ToString();
181 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 181 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
182 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); 182 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString();
183 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); 183 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
@@ -206,7 +206,7 @@ namespace OpenSim.Grid.UserServer
206 if (handlerUserLoggedInAtLocation != null) 206 if (handlerUserLoggedInAtLocation != null)
207 { 207 {
208 m_log.Info("[LOGIN]: Letting other objects know about login"); 208 m_log.Info("[LOGIN]: Letting other objects know about login");
209 handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, 209 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion,
210 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, 210 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z,
211 theUser.FirstName,theUser.SurName); 211 theUser.FirstName,theUser.SurName);
212 } 212 }
@@ -268,7 +268,7 @@ namespace OpenSim.Grid.UserServer
268 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); 268 SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
269 SimParams["firstname"] = theUser.FirstName; 269 SimParams["firstname"] = theUser.FirstName;
270 SimParams["lastname"] = theUser.SurName; 270 SimParams["lastname"] = theUser.SurName;
271 SimParams["agent_id"] = theUser.Id.ToString(); 271 SimParams["agent_id"] = theUser.ID.ToString();
272 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); 272 SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
273 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); 273 SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString();
274 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); 274 SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
@@ -286,7 +286,7 @@ namespace OpenSim.Grid.UserServer
286 if (handlerUserLoggedInAtLocation != null) 286 if (handlerUserLoggedInAtLocation != null)
287 { 287 {
288 m_log.Info("[LOGIN]: Letting other objects know about login"); 288 m_log.Info("[LOGIN]: Letting other objects know about login");
289 handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, 289 handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion,
290 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, 290 theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z,
291 theUser.FirstName, theUser.SurName); 291 theUser.FirstName, theUser.SurName);
292 } 292 }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index cf05bfd..cf3f8d8 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -127,17 +127,17 @@ namespace OpenSim.Grid.UserServer
127 // Account information 127 // Account information
128 responseData["firstname"] = profile.FirstName; 128 responseData["firstname"] = profile.FirstName;
129 responseData["lastname"] = profile.SurName; 129 responseData["lastname"] = profile.SurName;
130 responseData["uuid"] = profile.Id.ToString(); 130 responseData["uuid"] = profile.ID.ToString();
131 // Server Information 131 // Server Information
132 responseData["server_inventory"] = profile.UserInventoryURI; 132 responseData["server_inventory"] = profile.UserInventoryURI;
133 responseData["server_asset"] = profile.UserAssetURI; 133 responseData["server_asset"] = profile.UserAssetURI;
134 // Profile Information 134 // Profile Information
135 responseData["profile_about"] = profile.ProfileAboutText; 135 responseData["profile_about"] = profile.AboutText;
136 responseData["profile_firstlife_about"] = profile.ProfileFirstText; 136 responseData["profile_firstlife_about"] = profile.FirstLifeAboutText;
137 responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToString(); 137 responseData["profile_firstlife_image"] = profile.FirstLifeImage.ToString();
138 responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString(); 138 responseData["profile_can_do"] = profile.CanDoMask.ToString();
139 responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString(); 139 responseData["profile_want_do"] = profile.WantDoMask.ToString();
140 responseData["profile_image"] = profile.ProfileImage.ToString(); 140 responseData["profile_image"] = profile.Image.ToString();
141 responseData["profile_created"] = profile.Created.ToString(); 141 responseData["profile_created"] = profile.Created.ToString();
142 responseData["profile_lastlogin"] = profile.LastLogin.ToString(); 142 responseData["profile_lastlogin"] = profile.LastLogin.ToString();
143 // Home region information 143 // Home region information
@@ -341,11 +341,11 @@ namespace OpenSim.Grid.UserServer
341 } 341 }
342 if (requestData.Contains("FLImageID")) 342 if (requestData.Contains("FLImageID"))
343 { 343 {
344 userProfile.ProfileFirstImage = new LLUUID((string)requestData["FLImageID"]); 344 userProfile.FirstLifeImage = new LLUUID((string)requestData["FLImageID"]);
345 } 345 }
346 if (requestData.Contains("ImageID")) 346 if (requestData.Contains("ImageID"))
347 { 347 {
348 userProfile.ProfileImage = new LLUUID((string)requestData["ImageID"]); 348 userProfile.Image = new LLUUID((string)requestData["ImageID"]);
349 } 349 }
350 // dont' know how yet 350 // dont' know how yet
351 if (requestData.Contains("MaturePublish")) 351 if (requestData.Contains("MaturePublish"))
@@ -353,11 +353,11 @@ namespace OpenSim.Grid.UserServer
353 } 353 }
354 if (requestData.Contains("AboutText")) 354 if (requestData.Contains("AboutText"))
355 { 355 {
356 userProfile.ProfileAboutText = (string)requestData["AboutText"]; 356 userProfile.AboutText = (string)requestData["AboutText"];
357 } 357 }
358 if (requestData.Contains("FLAboutText")) 358 if (requestData.Contains("FLAboutText"))
359 { 359 {
360 userProfile.ProfileFirstText = (string)requestData["FLAboutText"]; 360 userProfile.FirstLifeAboutText = (string)requestData["FLAboutText"];
361 } 361 }
362 // not in DB yet. 362 // not in DB yet.
363 if (requestData.Contains("ProfileURL")) 363 if (requestData.Contains("ProfileURL"))
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index e8c3f7c..939bd8f 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -3100,11 +3100,11 @@ namespace OpenSim.Region.ClientStack
3100 { 3100 {
3101 AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData; 3101 AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData;
3102 UserProfileData UserProfile = new UserProfileData(); 3102 UserProfileData UserProfile = new UserProfileData();
3103 UserProfile.Id = AgentId; 3103 UserProfile.ID = AgentId;
3104 UserProfile.ProfileAboutText = Helpers.FieldToUTF8String(Properties.AboutText); 3104 UserProfile.AboutText = Helpers.FieldToUTF8String(Properties.AboutText);
3105 UserProfile.ProfileFirstText = Helpers.FieldToUTF8String(Properties.FLAboutText); 3105 UserProfile.FirstLifeAboutText = Helpers.FieldToUTF8String(Properties.FLAboutText);
3106 UserProfile.ProfileFirstImage = Properties.FLImageID; 3106 UserProfile.FirstLifeImage = Properties.FLImageID;
3107 UserProfile.ProfileImage = Properties.ImageID; 3107 UserProfile.Image = Properties.ImageID;
3108 3108
3109 handlerUpdateAvatarProperties(this, UserProfile); 3109 handlerUpdateAvatarProperties(this, UserProfile);
3110 } 3110 }
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index e91cab5..2b023a6 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -149,8 +149,8 @@ namespace OpenSim.Region.ClientStack
149 149
150 if (masterAvatar != null) 150 if (masterAvatar != null)
151 { 151 {
152 m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.Id.ToString() + "]"); 152 m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.ID.ToString() + "]");
153 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.Id; 153 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
154 } 154 }
155 else 155 else
156 { 156 {
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index d1d3e22..8895c6e 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Local
87 profile = m_userManager.GetUserProfile(firstname, lastname); 87 profile = m_userManager.GetUserProfile(firstname, lastname);
88 if (profile != null) 88 if (profile != null)
89 { 89 {
90 m_Parent.InventoryService.CreateNewUserInventory(profile.Id); 90 m_Parent.InventoryService.CreateNewUserInventory(profile.ID);
91 } 91 }
92 92
93 return profile; 93 return profile;
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Communications.Local
169 169
170 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); 170 LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
171 171
172 response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.Id)); 172 response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID));
173 173
174 Login _login = new Login(); 174 Login _login = new Login();
175 //copy data to login object 175 //copy data to login object
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 00514e8..c543762 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Communications.Local
84 } 84 }
85 else 85 else
86 { 86 {
87 m_inventoryService.CreateNewUserInventory(profile.Id); 87 m_inventoryService.CreateNewUserInventory(profile.ID);
88 } 88 }
89 89
90 return profile; 90 return profile;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 9796cf4..906101b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -62,15 +62,15 @@ namespace OpenSim.Region.Communications.OGS1
62 UserProfileData userData = new UserProfileData(); 62 UserProfileData userData = new UserProfileData();
63 userData.FirstName = (string) data["firstname"]; 63 userData.FirstName = (string) data["firstname"];
64 userData.SurName = (string) data["lastname"]; 64 userData.SurName = (string) data["lastname"];
65 userData.Id = new LLUUID((string) data["uuid"]); 65 userData.ID = new LLUUID((string) data["uuid"]);
66 userData.UserInventoryURI = (string) data["server_inventory"]; 66 userData.UserInventoryURI = (string) data["server_inventory"];
67 userData.UserAssetURI = (string) data["server_asset"]; 67 userData.UserAssetURI = (string) data["server_asset"];
68 userData.ProfileFirstText = (string) data["profile_firstlife_about"]; 68 userData.FirstLifeAboutText = (string) data["profile_firstlife_about"];
69 userData.ProfileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); 69 userData.FirstLifeImage = new LLUUID((string) data["profile_firstlife_image"]);
70 userData.ProfileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); 70 userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
71 userData.ProfileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); 71 userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
72 userData.ProfileAboutText = (string)data["profile_about"]; 72 userData.AboutText = (string)data["profile_about"];
73 userData.ProfileImage = new LLUUID((string) data["profile_image"]); 73 userData.Image = new LLUUID((string) data["profile_image"]);
74 userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); 74 userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
75 userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); 75 userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]);
76 userData.HomeLocation = 76 userData.HomeLocation =
@@ -306,13 +306,13 @@ namespace OpenSim.Region.Communications.OGS1
306 { 306 {
307 m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile."); 307 m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
308 Hashtable param = new Hashtable(); 308 Hashtable param = new Hashtable();
309 param["avatar_uuid"] = UserProfile.Id.ToString(); 309 param["avatar_uuid"] = UserProfile.ID.ToString();
310 //param["AllowPublish"] = UserProfile.ToString(); 310 //param["AllowPublish"] = UserProfile.ToString();
311 param["FLImageID"] = UserProfile.ProfileFirstImage.ToString(); 311 param["FLImageID"] = UserProfile.FirstLifeImage.ToString();
312 param["ImageID"] = UserProfile.ProfileImage.ToString(); 312 param["ImageID"] = UserProfile.Image.ToString();
313 //param["MaturePublish"] = MaturePublish.ToString(); 313 //param["MaturePublish"] = MaturePublish.ToString();
314 param["AboutText"] = UserProfile.ProfileAboutText; 314 param["AboutText"] = UserProfile.AboutText;
315 param["FLAboutText"] = UserProfile.ProfileFirstText; 315 param["FLAboutText"] = UserProfile.FirstLifeAboutText;
316 //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); 316 //param["ProfileURL"] = UserProfile.ProfileURL.ToString();
317 IList parameters = new ArrayList(); 317 IList parameters = new ArrayList();
318 parameters.Add(param); 318 parameters.Add(param);
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 699e68d..e3ad297 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -90,10 +90,10 @@ namespace OpenSim.Region.Environment.Modules
90 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); 90 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
91 if (null != profile) 91 if (null != profile)
92 { 92 {
93 remoteClient.SendAvatarProperties(profile.Id, profile.ProfileAboutText, 93 remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
94 Util.ToDateTime(profile.Created).ToString(), 94 Util.ToDateTime(profile.Created).ToString(),
95 System.String.Empty, profile.ProfileFirstText, profile.ProfileCanDoMask, 95 System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
96 profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner); 96 profile.FirstLifeImage, profile.Image, System.String.Empty, partner);
97 } 97 }
98 else 98 else
99 { 99 {
@@ -103,15 +103,15 @@ namespace OpenSim.Region.Environment.Modules
103 103
104 public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) 104 public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
105 { 105 {
106 UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.Id); 106 UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
107 107
108 // if it's the profile of the user requesting the update, then we change only a few things. 108 // if it's the profile of the user requesting the update, then we change only a few things.
109 if (remoteClient.AgentId.CompareTo(Profile.Id) == 0) 109 if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
110 { 110 {
111 Profile.ProfileImage = newProfile.ProfileImage; 111 Profile.Image = newProfile.Image;
112 Profile.ProfileFirstImage = newProfile.ProfileFirstImage; 112 Profile.FirstLifeImage = newProfile.FirstLifeImage;
113 Profile.ProfileAboutText = newProfile.ProfileAboutText; 113 Profile.AboutText = newProfile.AboutText;
114 Profile.ProfileFirstText = newProfile.ProfileFirstText; 114 Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
115 } 115 }
116 else 116 else
117 { 117 {
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Modules
119 } 119 }
120 if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) 120 if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
121 { 121 {
122 RequestAvatarProperty(remoteClient, newProfile.Id); 122 RequestAvatarProperty(remoteClient, newProfile.ID);
123 } 123 }
124 } 124 }
125 } 125 }
generated by cgit v1.1 at 2024-11-09 07:12:55 +0000