OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

further renaming of properties for clarity

0.6.0-stable
Sean Dague 2008-04-10 14:09:30 +00:00
parent c176caeb05
commit 25fea01b92
19 changed files with 205 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/DB4o/DB4oManager.cs
View File

@ -125,10 +125,10 @@ namespace OpenSim.Data.DB4o
IObjectSet result = database.Get(typeof (UserProfileData)); IObjectSet result = database.Get(typeof (UserProfileData));
foreach (UserProfileData row in result) foreach (UserProfileData row in result)
{ {
if (userProfiles.ContainsKey(row.Id)) if (userProfiles.ContainsKey(row.ID))
userProfiles[row.Id] = row; userProfiles[row.ID] = row;
else else
userProfiles.Add(row.Id, row); userProfiles.Add(row.ID, row);
} }
database.Close(); database.Close();
} }
@ -145,13 +145,13 @@ namespace OpenSim.Data.DB4o
/// <returns>true on success, false on fail to persist to db</returns> /// <returns>true on success, false on fail to persist to db</returns>
public bool UpdateRecord(UserProfileData record) public bool UpdateRecord(UserProfileData record)
{ {
if (userProfiles.ContainsKey(record.Id)) if (userProfiles.ContainsKey(record.ID))
{ {
userProfiles[record.Id] = record; userProfiles[record.ID] = record;
} }
else else
{ {
userProfiles.Add(record.Id, record); userProfiles.Add(record.ID, record);
} }
try try

14
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

@ -300,7 +300,7 @@ namespace OpenSim.Data.MSSQL
if (reader.Read()) if (reader.Read())
{ {
retval.Id = new LLUUID((string)reader["UUID"]); retval.ID = new LLUUID((string)reader["UUID"]);
retval.FirstName = (string)reader["username"]; retval.FirstName = (string)reader["username"];
retval.SurName = (string)reader["lastname"]; retval.SurName = (string)reader["lastname"];
@ -323,14 +323,14 @@ namespace OpenSim.Data.MSSQL
retval.UserInventoryURI = (string)reader["userInventoryURI"]; retval.UserInventoryURI = (string)reader["userInventoryURI"];
retval.UserAssetURI = (string)reader["userAssetURI"]; retval.UserAssetURI = (string)reader["userAssetURI"];
retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
retval.ProfileAboutText = (string)reader["profileAboutText"]; retval.AboutText = (string)reader["profileAboutText"];
retval.ProfileFirstText = (string)reader["profileFirstText"]; retval.FirstLifeAboutText = (string)reader["profileFirstText"];
retval.ProfileImage = new LLUUID((string)reader["profileImage"]); retval.Image = new LLUUID((string)reader["profileImage"]);
retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]); retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]); retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
} }
else else

26
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@ -453,7 +453,7 @@ namespace OpenSim.Data.MSSQL
override public UserAgentData GetAgentByName(string user, string last) override public UserAgentData GetAgentByName(string user, string last)
{ {
UserProfileData profile = GetUserByName(user, last); UserProfileData profile = GetUserByName(user, last);
return GetAgentByUUID(profile.Id); return GetAgentByUUID(profile.ID);
} }
/// <summary> /// <summary>
@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
{ {
lock (database) lock (database)
{ {
InsertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, InsertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
user.HomeLocation.Z, user.HomeLocation.Z,
user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
user.LastLogin, user.UserInventoryURI, user.UserAssetURI, user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
user.ProfileCanDoMask, user.ProfileWantDoMask, user.CanDoMask, user.WantDoMask,
user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, user.AboutText, user.FirstLifeAboutText, user.Image,
user.ProfileFirstImage, user.WebLoginKey); user.FirstLifeImage, user.WebLoginKey);
} }
} }
catch (Exception e) catch (Exception e)
@ -651,7 +651,7 @@ namespace OpenSim.Data.MSSQL
"profileFirstImage = @profileFirstImage, " + "profileFirstImage = @profileFirstImage, " +
"webLoginKey = @webLoginKey where " + "webLoginKey = @webLoginKey where " +
"UUID = @keyUUUID;", database.getConnection()); "UUID = @keyUUUID;", database.getConnection());
SqlParameter param1 = new SqlParameter("@uuid", user.Id.ToString()); SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
SqlParameter param2 = new SqlParameter("@username", user.FirstName); SqlParameter param2 = new SqlParameter("@username", user.FirstName);
SqlParameter param3 = new SqlParameter("@lastname", user.SurName); SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash); SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
@ -667,13 +667,13 @@ namespace OpenSim.Data.MSSQL
SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin)); SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI); SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI); SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.ProfileCanDoMask)); SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.CanDoMask));
SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask)); SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText); SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText); SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString()); SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString()); SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.ToString()); SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString()); SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
command.Parameters.Add(param1); command.Parameters.Add(param1);
command.Parameters.Add(param2); command.Parameters.Add(param2);

22
OpenSim/Data/MySQL/MySQLManager.cs
View File

@ -431,7 +431,7 @@ namespace OpenSim.Data.MySQL
if (!LLUUID.TryParse((string)reader["UUID"], out id)) if (!LLUUID.TryParse((string)reader["UUID"], out id))
return null; return null;
retval.Id = id; retval.ID = id;
retval.FirstName = (string) reader["username"]; retval.FirstName = (string) reader["username"];
retval.SurName = (string) reader["lastname"]; retval.SurName = (string) reader["lastname"];
@ -454,33 +454,33 @@ namespace OpenSim.Data.MySQL
retval.UserInventoryURI = (string) reader["userInventoryURI"]; retval.UserInventoryURI = (string) reader["userInventoryURI"];
retval.UserAssetURI = (string) reader["userAssetURI"]; retval.UserAssetURI = (string) reader["userAssetURI"];
retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString()); retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString()); retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
if (reader.IsDBNull(reader.GetOrdinal("profileAboutText"))) if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
retval.ProfileAboutText = ""; retval.AboutText = "";
else else
retval.ProfileAboutText = (string) reader["profileAboutText"]; retval.AboutText = (string) reader["profileAboutText"];
if (reader.IsDBNull(reader.GetOrdinal("profileFirstText"))) if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
retval.ProfileFirstText = ""; retval.FirstLifeAboutText = "";
else else
retval.ProfileFirstText = (string)reader["profileFirstText"]; retval.FirstLifeAboutText = (string)reader["profileFirstText"];
if (reader.IsDBNull(reader.GetOrdinal("profileImage"))) if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
retval.ProfileImage = LLUUID.Zero; retval.Image = LLUUID.Zero;
else { else {
LLUUID tmp; LLUUID tmp;
LLUUID.TryParse((string)reader["profileImage"], out tmp); LLUUID.TryParse((string)reader["profileImage"], out tmp);
retval.ProfileImage = tmp; retval.Image = tmp;
} }
if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage"))) if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
retval.ProfileFirstImage = LLUUID.Zero; retval.FirstLifeImage = LLUUID.Zero;
else { else {
LLUUID tmp; LLUUID tmp;
LLUUID.TryParse((string)reader["profileFirstImage"], out tmp); LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
retval.ProfileFirstImage = tmp; retval.FirstLifeImage = tmp;
} }
if(reader.IsDBNull(reader.GetOrdinal("webLoginKey"))) if(reader.IsDBNull(reader.GetOrdinal("webLoginKey")))

16
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
override public UserAgentData GetAgentByName(string user, string last) override public UserAgentData GetAgentByName(string user, string last)
{ {
UserProfileData profile = GetUserByName(user, last); UserProfileData profile = GetUserByName(user, last);
return GetAgentByUUID(profile.Id); return GetAgentByUUID(profile.ID);
} }
override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey) override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
@ -547,14 +547,14 @@ namespace OpenSim.Data.MySQL
{ {
lock (database) lock (database)
{ {
database.insertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, database.insertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
user.HomeLocation.Z, user.HomeLocation.Z,
user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
user.LastLogin, user.UserInventoryURI, user.UserAssetURI, user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
user.ProfileCanDoMask, user.ProfileWantDoMask, user.CanDoMask, user.WantDoMask,
user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage, user.AboutText, user.FirstLifeAboutText, user.Image,
user.ProfileFirstImage, user.WebLoginKey); user.FirstLifeImage, user.WebLoginKey);
} }
} }
catch (Exception e) catch (Exception e)
@ -590,11 +590,11 @@ namespace OpenSim.Data.MySQL
/// <param name="user">The profile data to use to update the DB</param> /// <param name="user">The profile data to use to update the DB</param>
override public bool UpdateUserProfile(UserProfileData user) override public bool UpdateUserProfile(UserProfileData user)
{ {
database.updateUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt, database.updateUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X, 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.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI,
user.UserAssetURI, user.ProfileCanDoMask, user.ProfileWantDoMask, user.ProfileAboutText, user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage, user.WebLoginKey); user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey);
return true; return true;
} }

36
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
if (rows.Length > 0) if (rows.Length > 0)
{ {
UserProfileData user = buildUserProfile(rows[0]); UserProfileData user = buildUserProfile(rows[0]);
DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.Id)); DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.ID));
if (row != null) if (row != null)
{ {
user.CurrentAgent = buildUserAgent(row); user.CurrentAgent = buildUserAgent(row);
@ -365,7 +365,7 @@ namespace OpenSim.Data.SQLite
DataTable users = ds.Tables["users"]; DataTable users = ds.Tables["users"];
lock (ds) lock (ds)
{ {
DataRow row = users.Rows.Find(Util.ToRawUuidString(user.Id)); DataRow row = users.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null) if (row == null)
{ {
row = users.NewRow(); row = users.NewRow();
@ -384,7 +384,7 @@ namespace OpenSim.Data.SQLite
if (user.CurrentAgent != null) if (user.CurrentAgent != null)
{ {
DataTable ua = ds.Tables["useragents"]; DataTable ua = ds.Tables["useragents"];
row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null) if (row == null)
{ {
row = ua.NewRow(); row = ua.NewRow();
@ -401,7 +401,7 @@ namespace OpenSim.Data.SQLite
// I just added this to help the standalone login situation. // I just added this to help the standalone login situation.
//It still needs to be looked at by a Database guy //It still needs to be looked at by a Database guy
DataTable ua = ds.Tables["useragents"]; DataTable ua = ds.Tables["useragents"];
row = ua.Rows.Find(Util.ToRawUuidString(user.Id)); row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null) if (row == null)
{ {
@ -593,7 +593,7 @@ namespace OpenSim.Data.SQLite
UserProfileData user = new UserProfileData(); UserProfileData user = new UserProfileData();
LLUUID tmp; LLUUID tmp;
LLUUID.TryParse((String)row["UUID"], out tmp); LLUUID.TryParse((String)row["UUID"], out tmp);
user.Id = tmp; user.ID = tmp;
user.FirstName = (String) row["username"]; user.FirstName = (String) row["username"];
user.SurName = (String) row["surname"]; user.SurName = (String) row["surname"];
user.PasswordHash = (String) row["passwordHash"]; user.PasswordHash = (String) row["passwordHash"];
@ -616,14 +616,14 @@ namespace OpenSim.Data.SQLite
user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
user.UserInventoryURI = (String) row["userInventoryURI"]; user.UserInventoryURI = (String) row["userInventoryURI"];
user.UserAssetURI = (String) row["userAssetURI"]; user.UserAssetURI = (String) row["userAssetURI"];
user.ProfileCanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
user.ProfileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]); user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
user.ProfileAboutText = (String) row["profileAboutText"]; user.AboutText = (String) row["profileAboutText"];
user.ProfileFirstText = (String) row["profileFirstText"]; user.FirstLifeAboutText = (String) row["profileFirstText"];
LLUUID.TryParse((String)row["profileImage"], out tmp); LLUUID.TryParse((String)row["profileImage"], out tmp);
user.ProfileImage = tmp; user.Image = tmp;
LLUUID.TryParse((String)row["profileFirstImage"], out tmp); LLUUID.TryParse((String)row["profileFirstImage"], out tmp);
user.ProfileFirstImage = tmp; user.FirstLifeImage = tmp;
user.WebLoginKey = new LLUUID((String) row["webLoginKey"]); user.WebLoginKey = new LLUUID((String) row["webLoginKey"]);
return user; return user;
@ -631,7 +631,7 @@ namespace OpenSim.Data.SQLite
private void fillUserRow(DataRow row, UserProfileData user) private void fillUserRow(DataRow row, UserProfileData user)
{ {
row["UUID"] = Util.ToRawUuidString(user.Id); row["UUID"] = Util.ToRawUuidString(user.ID);
row["username"] = user.FirstName; row["username"] = user.FirstName;
row["surname"] = user.SurName; row["surname"] = user.SurName;
row["passwordHash"] = user.PasswordHash; row["passwordHash"] = user.PasswordHash;
@ -652,12 +652,12 @@ namespace OpenSim.Data.SQLite
row["rootInventoryFolderID"] = user.RootInventoryFolderID; row["rootInventoryFolderID"] = user.RootInventoryFolderID;
row["userInventoryURI"] = user.UserInventoryURI; row["userInventoryURI"] = user.UserInventoryURI;
row["userAssetURI"] = user.UserAssetURI; row["userAssetURI"] = user.UserAssetURI;
row["profileCanDoMask"] = user.ProfileCanDoMask; row["profileCanDoMask"] = user.CanDoMask;
row["profileWantDoMask"] = user.ProfileWantDoMask; row["profileWantDoMask"] = user.WantDoMask;
row["profileAboutText"] = user.ProfileAboutText; row["profileAboutText"] = user.AboutText;
row["profileFirstText"] = user.ProfileFirstText; row["profileFirstText"] = user.FirstLifeAboutText;
row["profileImage"] = user.ProfileImage; row["profileImage"] = user.Image;
row["profileFirstImage"] = user.ProfileFirstImage; row["profileFirstImage"] = user.FirstLifeImage;
row["webLoginKey"] = user.WebLoginKey; row["webLoginKey"] = user.WebLoginKey;
// ADO.NET doesn't handle NULL very well // ADO.NET doesn't handle NULL very well

10
OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Framework.Communications.Cache
// "[INVENTORY CACHE]: Received folder {0} {1} for user {2}", // "[INVENTORY CACHE]: Received folder {0} {1} for user {2}",
// folderInfo.name, folderInfo.folderID, userID); // folderInfo.name, folderInfo.folderID, userID);
if (userID == UserProfile.Id) if (userID == UserProfile.ID)
{ {
if (RootFolder == null) if (RootFolder == null)
{ {
@ -169,7 +169,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <param name="folderInfo"></param> /// <param name="folderInfo"></param>
public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo)
{ {
if ((userID == UserProfile.Id) && (RootFolder != null)) if ((userID == UserProfile.ID) && (RootFolder != null))
{ {
if (itemInfo.Folder == RootFolder.ID) if (itemInfo.Folder == RootFolder.ID)
{ {
@ -194,7 +194,7 @@ namespace OpenSim.Framework.Communications.Cache
public void AddItem(LLUUID userID, InventoryItemBase itemInfo) public void AddItem(LLUUID userID, InventoryItemBase itemInfo)
{ {
if ((userID == UserProfile.Id) && (RootFolder != null)) if ((userID == UserProfile.ID) && (RootFolder != null))
{ {
ItemReceive(userID, itemInfo); ItemReceive(userID, itemInfo);
m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
@ -203,7 +203,7 @@ namespace OpenSim.Framework.Communications.Cache
public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo) public void UpdateItem(LLUUID userID, InventoryItemBase itemInfo)
{ {
if ((userID == UserProfile.Id) && (RootFolder != null)) if ((userID == UserProfile.ID) && (RootFolder != null))
{ {
m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); m_parentCommsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
} }
@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Cache
public bool DeleteItem(LLUUID userID, InventoryItemBase item) public bool DeleteItem(LLUUID userID, InventoryItemBase item)
{ {
bool result = false; bool result = false;
if ((userID == UserProfile.Id) && (RootFolder != null)) if ((userID == UserProfile.ID) && (RootFolder != null))
{ {
result = RootFolder.DeleteItem(item.ID); result = RootFolder.DeleteItem(item.ID);
if (result) if (result)

6
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@ -164,9 +164,9 @@ namespace OpenSim.Framework.Communications
} }
else else
{ {
m_inventoryService.CreateNewUserInventory(userProf.Id); m_inventoryService.CreateNewUserInventory(userProf.ID);
m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName); m_log.Info("[USERS]: Created new inventory set for " + firstName + " " + lastName);
return userProf.Id; return userProf.ID;
} }
} }
@ -249,7 +249,7 @@ namespace OpenSim.Framework.Communications
UserProfileData profileData = m_userService.GetUserProfile(uuid); UserProfileData profileData = m_userService.GetUserProfile(uuid);
if (profileData != null) if (profileData != null)
{ {
LLUUID profileId = profileData.Id; LLUUID profileId = profileData.ID;
string firstname = profileData.FirstName; string firstname = profileData.FirstName;
string lastname = profileData.SurName; string lastname = profileData.SurName;

10
OpenSim/Framework/Communications/LoginService.cs
View File

@ -207,7 +207,7 @@ namespace OpenSim.Framework.UserManagement
try try
{ {
LLUUID agentID = userProfile.Id; LLUUID agentID = userProfile.ID;
// Inventory Library Section // Inventory Library Section
InventoryData inventData = GetInventorySkeleton(agentID); InventoryData inventData = GetInventorySkeleton(agentID);
@ -349,7 +349,7 @@ namespace OpenSim.Framework.UserManagement
try try
{ {
LLUUID agentID = userProfile.Id; LLUUID agentID = userProfile.ID;
// Inventory Library Section // Inventory Library Section
InventoryData inventData = GetInventorySkeleton(agentID); InventoryData inventData = GetInventorySkeleton(agentID);
@ -491,7 +491,7 @@ namespace OpenSim.Framework.UserManagement
if (goodweblogin) if (goodweblogin)
{ {
LLUUID webloginkey = LLUUID.Random(); LLUUID webloginkey = LLUUID.Random();
m_userManager.StoreWebLoginKey(user.Id, webloginkey); m_userManager.StoreWebLoginKey(user.ID, webloginkey);
statuscode = 301; statuscode = 301;
string redirectURL = "about:blank?redirect-http-hack=" + string redirectURL = "about:blank?redirect-http-hack=" +
@ -639,7 +639,7 @@ namespace OpenSim.Framework.UserManagement
public virtual bool AuthenticateUser(UserProfileData profile, string password) public virtual bool AuthenticateUser(UserProfileData profile, string password)
{ {
bool passwordSuccess = false; bool passwordSuccess = false;
m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
// Web Login method seems to also occasionally send the hashed password itself // Web Login method seems to also occasionally send the hashed password itself
@ -664,7 +664,7 @@ namespace OpenSim.Framework.UserManagement
public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey) public virtual bool AuthenticateUser(UserProfileData profile, LLUUID webloginkey)
{ {
bool passwordSuccess = false; bool passwordSuccess = false;
m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.Id); m_log.InfoFormat("[LOGIN]: Authenticating {0} {1} ({2})", profile.FirstName, profile.SurName, profile.ID);
// Match web login key unless it's the default weblogin key LLUUID.Zero // Match web login key unless it's the default weblogin key LLUUID.Zero
passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero); passwordSuccess = ((profile.WebLoginKey==webloginkey) && profile.WebLoginKey != LLUUID.Zero);

18
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Framework.UserManagement
if (profile != null) if (profile != null)
{ {
profile.CurrentAgent = getUserAgent(profile.Id); profile.CurrentAgent = getUserAgent(profile.ID);
return profile; return profile;
} }
} }
@ -113,7 +113,7 @@ namespace OpenSim.Framework.UserManagement
if (null != profile) if (null != profile)
{ {
profile.CurrentAgent = getUserAgent(profile.Id); profile.CurrentAgent = getUserAgent(profile.ID);
return profile; return profile;
} }
} }
@ -355,7 +355,7 @@ namespace OpenSim.Framework.UserManagement
agent.sessionID = new LLUUID(randDataS, 0); agent.sessionID = new LLUUID(randDataS, 0);
// Profile UUID // Profile UUID
agent.UUID = profile.Id; agent.UUID = profile.ID;
// Current position (from Home) // Current position (from Home)
agent.currentHandle = profile.HomeRegion; agent.currentHandle = profile.HomeRegion;
@ -481,7 +481,7 @@ namespace OpenSim.Framework.UserManagement
agent.sessionID = new LLUUID(randDataS, 0); agent.sessionID = new LLUUID(randDataS, 0);
// Profile UUID // Profile UUID
agent.UUID = profile.Id; agent.UUID = profile.ID;
// Current position (from Home) // Current position (from Home)
agent.currentHandle = profile.HomeRegion; agent.currentHandle = profile.HomeRegion;
@ -523,7 +523,7 @@ namespace OpenSim.Framework.UserManagement
{ {
UserProfileData user = new UserProfileData(); UserProfileData user = new UserProfileData();
user.HomeLocation = new LLVector3(128, 128, 100); user.HomeLocation = new LLVector3(128, 128, 100);
user.Id = LLUUID.Random(); user.ID = LLUUID.Random();
user.FirstName = firstName; user.FirstName = firstName;
user.SurName = lastName; user.SurName = lastName;
user.PasswordHash = pass; user.PasswordHash = pass;
@ -545,14 +545,14 @@ namespace OpenSim.Framework.UserManagement
} }
} }
return user.Id; return user.ID;
} }
public bool UpdateUserProfileProperties(UserProfileData UserProfile) public bool UpdateUserProfileProperties(UserProfileData UserProfile)
{ {
if (null == GetUserProfile(UserProfile.Id)) if (null == GetUserProfile(UserProfile.ID))
{ {
m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.Id.ToString()); m_log.Info("[USERSTORAGE]: Failed to find User by UUID " + UserProfile.ID.ToString());
return false; return false;
} }
foreach (KeyValuePair<string, IUserData> plugin in _plugins) foreach (KeyValuePair<string, IUserData> plugin in _plugins)
@ -563,7 +563,7 @@ namespace OpenSim.Framework.UserManagement
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.Id.ToString() m_log.Info("[USERSTORAGE]: Unable to update user " + UserProfile.ID.ToString()
+ " via " + plugin.Key + "(" + e.ToString() + ")"); + " via " + plugin.Key + "(" + e.ToString() + ")");
return false; return false;
} }

146
OpenSim/Framework/UserProfileData.cs
View File

@ -43,42 +43,42 @@ namespace OpenSim.Framework
/// <summary> /// <summary>
/// The last used Web_login_key /// The last used Web_login_key
/// </summary> /// </summary>
private LLUUID webLoginKey; private LLUUID _webLoginKey;
/// <summary> /// <summary>
/// The first component of a users account name /// The first component of a users account name
/// </summary> /// </summary>
private string username; private string _firstname;
/// <summary> /// <summary>
/// The second component of a users account name /// The second component of a users account name
/// </summary> /// </summary>
private string surname; private string _surname;
/// <summary> /// <summary>
/// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
/// </summary> /// </summary>
/// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
private string passwordHash; private string _passwordHash;
/// <summary> /// <summary>
/// The salt used for the users hash, should be 32 bytes or longer /// The salt used for the users hash, should be 32 bytes or longer
/// </summary> /// </summary>
private string passwordSalt; private string _passwordSalt;
/// <summary> /// <summary>
/// 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 /// 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
/// </summary> /// </summary>
public ulong HomeRegion public ulong HomeRegion
{ {
get { return Helpers.UIntsToLong((homeRegionX * (uint)Constants.RegionSize), (homeRegionY * (uint)Constants.RegionSize)); } get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); }
set set
{ {
homeRegionX = (uint) (value >> 40); _homeRegionX = (uint) (value >> 40);
homeRegionY = (((uint) (value)) >> 8); _homeRegionY = (((uint) (value)) >> 8);
} }
} }
public LLUUID Id { public LLUUID ID {
get { get {
return _id; return _id;
} }
@ -89,261 +89,261 @@ namespace OpenSim.Framework
public LLUUID WebLoginKey { public LLUUID WebLoginKey {
get { get {
return webLoginKey; return _webLoginKey;
} }
set { set {
webLoginKey = value; _webLoginKey = value;
} }
} }
public string FirstName { public string FirstName {
get { get {
return username; return _firstname;
} }
set { set {
username = value; _firstname = value;
} }
} }
public string SurName { public string SurName {
get { get {
return surname; return _surname;
} }
set { set {
surname = value; _surname = value;
} }
} }
public string PasswordHash { public string PasswordHash {
get { get {
return passwordHash; return _passwordHash;
} }
set { set {
passwordHash = value; _passwordHash = value;
} }
} }
public string PasswordSalt { public string PasswordSalt {
get { get {
return passwordSalt; return _passwordSalt;
} }
set { set {
passwordSalt = value; _passwordSalt = value;
} }
} }
public uint HomeRegionX { public uint HomeRegionX {
get { get {
return homeRegionX; return _homeRegionX;
} }
set { set {
homeRegionX = value; _homeRegionX = value;
} }
} }
public uint HomeRegionY { public uint HomeRegionY {
get { get {
return homeRegionY; return _homeRegionY;
} }
set { set {
homeRegionY = value; _homeRegionY = value;
} }
} }
public LLVector3 HomeLocation { public LLVector3 HomeLocation {
get { get {
return homeLocation; return _homeLocation;
} }
set { set {
homeLocation = value; _homeLocation = value;
} }
} }
public LLVector3 HomeLookAt { public LLVector3 HomeLookAt {
get { get {
return homeLookAt; return _homeLookAt;
} }
set { set {
homeLookAt = value; _homeLookAt = value;
} }
} }
public int Created { public int Created {
get { get {
return created; return _created;
} }
set { set {
created = value; _created = value;
} }
} }
public int LastLogin { public int LastLogin {
get { get {
return lastLogin; return _lastLogin;
} }
set { set {
lastLogin = value; _lastLogin = value;
} }
} }
public LLUUID RootInventoryFolderID { public LLUUID RootInventoryFolderID {
get { get {
return rootInventoryFolderID; return _rootInventoryFolderID;
} }
set { set {
rootInventoryFolderID = value; _rootInventoryFolderID = value;
} }
} }
public string UserInventoryURI { public string UserInventoryURI {
get { get {
return userInventoryURI; return _userInventoryURI;
} }
set { set {
userInventoryURI = value; _userInventoryURI = value;
} }
} }
public string UserAssetURI { public string UserAssetURI {
get { get {
return userAssetURI; return _userAssetURI;
} }
set { set {
userAssetURI = value; _userAssetURI = value;
} }
} }
public uint ProfileCanDoMask { public uint CanDoMask {
get { get {
return profileCanDoMask; return _profileCanDoMask;
} }
set { set {
profileCanDoMask = value; _profileCanDoMask = value;
} }
} }
public uint ProfileWantDoMask { public uint WantDoMask {
get { get {
return profileWantDoMask; return _profileWantDoMask;
} }
set { set {
profileWantDoMask = value; _profileWantDoMask = value;
} }
} }
public string ProfileAboutText { public string AboutText {
get { get {
return profileAboutText; return _profileAboutText;
} }
set { set {
profileAboutText = value; _profileAboutText = value;
} }
} }
public string ProfileFirstText { public string FirstLifeAboutText {
get { get {
return profileFirstText; return _profileFirstText;
} }
set { set {
profileFirstText = value; _profileFirstText = value;
} }
} }
public LLUUID ProfileImage { public LLUUID Image {
get { get {
return profileImage; return _profileImage;
} }
set { set {
profileImage = value; _profileImage = value;
} }
} }
public LLUUID ProfileFirstImage { public LLUUID FirstLifeImage {
get { get {
return profileFirstImage; return _profileFirstImage;
} }
set { set {
profileFirstImage = value; _profileFirstImage = value;
} }
} }
public UserAgentData CurrentAgent { public UserAgentData CurrentAgent {
get { get {
return currentAgent; return _currentAgent;
} }
set { set {
currentAgent = value; _currentAgent = value;
} }
} }
private uint homeRegionX; private uint _homeRegionX;
private uint homeRegionY; private uint _homeRegionY;
/// <summary> /// <summary>
/// The coordinates inside the region of the home location /// The coordinates inside the region of the home location
/// </summary> /// </summary>
private LLVector3 homeLocation; private LLVector3 _homeLocation;
/// <summary> /// <summary>
/// Where the user will be looking when they rez. /// Where the user will be looking when they rez.
/// </summary> /// </summary>
private LLVector3 homeLookAt; private LLVector3 _homeLookAt;
/// <summary> /// <summary>
/// A UNIX Timestamp (seconds since epoch) for the users creation /// A UNIX Timestamp (seconds since epoch) for the users creation
/// </summary> /// </summary>
private int created; private int _created;
/// <summary> /// <summary>
/// A UNIX Timestamp for the users last login date / time /// A UNIX Timestamp for the users last login date / time
/// </summary> /// </summary>
private int lastLogin; private int _lastLogin;
private LLUUID rootInventoryFolderID; private LLUUID _rootInventoryFolderID;
/// <summary> /// <summary>
/// A URI to the users inventory server, used for foreigners and large grids /// A URI to the users inventory server, used for foreigners and large grids
/// </summary> /// </summary>
private string userInventoryURI = String.Empty; private string _userInventoryURI = String.Empty;
/// <summary> /// <summary>
/// A URI to the users asset server, used for foreigners and large grids. /// A URI to the users asset server, used for foreigners and large grids.
/// </summary> /// </summary>
private string userAssetURI = String.Empty; private string _userAssetURI = String.Empty;
/// <summary> /// <summary>
/// A uint mask containing the "I can do" fields of the users profile /// A uint mask containing the "I can do" fields of the users profile
/// </summary> /// </summary>
private uint profileCanDoMask; private uint _profileCanDoMask;
/// <summary> /// <summary>
/// A uint mask containing the "I want to do" part of the users profile /// A uint mask containing the "I want to do" part of the users profile
/// </summary> /// </summary>
private uint profileWantDoMask; // Profile window "I want to" mask private uint _profileWantDoMask; // Profile window "I want to" mask
/// <summary> /// <summary>
/// The about text listed in a users profile. /// The about text listed in a users profile.
/// </summary> /// </summary>
private string profileAboutText = String.Empty; private string _profileAboutText = String.Empty;
/// <summary> /// <summary>
/// The first life about text listed in a users profile /// The first life about text listed in a users profile
/// </summary> /// </summary>
private string profileFirstText = String.Empty; private string _profileFirstText = String.Empty;
/// <summary> /// <summary>
/// The profile image for an avatar stored on the asset server /// The profile image for an avatar stored on the asset server
/// </summary> /// </summary>
private LLUUID profileImage; private LLUUID _profileImage;
/// <summary> /// <summary>
/// The profile image for the users first life tab /// The profile image for the users first life tab
/// </summary> /// </summary>
private LLUUID profileFirstImage; private LLUUID _profileFirstImage;
/// <summary> /// <summary>
/// The users last registered agent (filled in on the user server) /// The users last registered agent (filled in on the user server)
/// </summary> /// </summary>
private UserAgentData currentAgent; private UserAgentData _currentAgent;
} }
} }

8
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -177,7 +177,7 @@ namespace OpenSim.Grid.UserServer
SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
SimParams["firstname"] = theUser.FirstName; SimParams["firstname"] = theUser.FirstName;
SimParams["lastname"] = theUser.SurName; SimParams["lastname"] = theUser.SurName;
SimParams["agent_id"] = theUser.Id.ToString(); SimParams["agent_id"] = theUser.ID.ToString();
SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString();
SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
@ -206,7 +206,7 @@ namespace OpenSim.Grid.UserServer
if (handlerUserLoggedInAtLocation != null) if (handlerUserLoggedInAtLocation != null)
{ {
m_log.Info("[LOGIN]: Letting other objects know about login"); m_log.Info("[LOGIN]: Letting other objects know about login");
handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion,
theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z, theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X,theUser.CurrentAgent.currentPos.Y,theUser.CurrentAgent.currentPos.Z,
theUser.FirstName,theUser.SurName); theUser.FirstName,theUser.SurName);
} }
@ -268,7 +268,7 @@ namespace OpenSim.Grid.UserServer
SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString(); SimParams["secure_session_id"] = theUser.CurrentAgent.secureSessionID.ToString();
SimParams["firstname"] = theUser.FirstName; SimParams["firstname"] = theUser.FirstName;
SimParams["lastname"] = theUser.SurName; SimParams["lastname"] = theUser.SurName;
SimParams["agent_id"] = theUser.Id.ToString(); SimParams["agent_id"] = theUser.ID.ToString();
SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode); SimParams["circuit_code"] = (Int32) Convert.ToUInt32(response.CircuitCode);
SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString(); SimParams["startpos_x"] = theUser.CurrentAgent.currentPos.X.ToString();
SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString(); SimParams["startpos_y"] = theUser.CurrentAgent.currentPos.Y.ToString();
@ -286,7 +286,7 @@ namespace OpenSim.Grid.UserServer
if (handlerUserLoggedInAtLocation != null) if (handlerUserLoggedInAtLocation != null)
{ {
m_log.Info("[LOGIN]: Letting other objects know about login"); m_log.Info("[LOGIN]: Letting other objects know about login");
handlerUserLoggedInAtLocation(theUser.Id, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion, handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.sessionID, theUser.CurrentAgent.currentRegion,
theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z, theUser.CurrentAgent.currentHandle, theUser.CurrentAgent.currentPos.X, theUser.CurrentAgent.currentPos.Y, theUser.CurrentAgent.currentPos.Z,
theUser.FirstName, theUser.SurName); theUser.FirstName, theUser.SurName);
} }

22
OpenSim/Grid/UserServer/UserManager.cs
View File

@ -127,17 +127,17 @@ namespace OpenSim.Grid.UserServer
// Account information // Account information
responseData["firstname"] = profile.FirstName; responseData["firstname"] = profile.FirstName;
responseData["lastname"] = profile.SurName; responseData["lastname"] = profile.SurName;
responseData["uuid"] = profile.Id.ToString(); responseData["uuid"] = profile.ID.ToString();
// Server Information // Server Information
responseData["server_inventory"] = profile.UserInventoryURI; responseData["server_inventory"] = profile.UserInventoryURI;
responseData["server_asset"] = profile.UserAssetURI; responseData["server_asset"] = profile.UserAssetURI;
// Profile Information // Profile Information
responseData["profile_about"] = profile.ProfileAboutText; responseData["profile_about"] = profile.AboutText;
responseData["profile_firstlife_about"] = profile.ProfileFirstText; responseData["profile_firstlife_about"] = profile.FirstLifeAboutText;
responseData["profile_firstlife_image"] = profile.ProfileFirstImage.ToString(); responseData["profile_firstlife_image"] = profile.FirstLifeImage.ToString();
responseData["profile_can_do"] = profile.ProfileCanDoMask.ToString(); responseData["profile_can_do"] = profile.CanDoMask.ToString();
responseData["profile_want_do"] = profile.ProfileWantDoMask.ToString(); responseData["profile_want_do"] = profile.WantDoMask.ToString();
responseData["profile_image"] = profile.ProfileImage.ToString(); responseData["profile_image"] = profile.Image.ToString();
responseData["profile_created"] = profile.Created.ToString(); responseData["profile_created"] = profile.Created.ToString();
responseData["profile_lastlogin"] = profile.LastLogin.ToString(); responseData["profile_lastlogin"] = profile.LastLogin.ToString();
// Home region information // Home region information
@ -341,11 +341,11 @@ namespace OpenSim.Grid.UserServer
} }
if (requestData.Contains("FLImageID")) if (requestData.Contains("FLImageID"))
{ {
userProfile.ProfileFirstImage = new LLUUID((string)requestData["FLImageID"]); userProfile.FirstLifeImage = new LLUUID((string)requestData["FLImageID"]);
} }
if (requestData.Contains("ImageID")) if (requestData.Contains("ImageID"))
{ {
userProfile.ProfileImage = new LLUUID((string)requestData["ImageID"]); userProfile.Image = new LLUUID((string)requestData["ImageID"]);
} }
// dont' know how yet // dont' know how yet
if (requestData.Contains("MaturePublish")) if (requestData.Contains("MaturePublish"))
@ -353,11 +353,11 @@ namespace OpenSim.Grid.UserServer
} }
if (requestData.Contains("AboutText")) if (requestData.Contains("AboutText"))
{ {
userProfile.ProfileAboutText = (string)requestData["AboutText"]; userProfile.AboutText = (string)requestData["AboutText"];
} }
if (requestData.Contains("FLAboutText")) if (requestData.Contains("FLAboutText"))
{ {
userProfile.ProfileFirstText = (string)requestData["FLAboutText"]; userProfile.FirstLifeAboutText = (string)requestData["FLAboutText"];
} }
// not in DB yet. // not in DB yet.
if (requestData.Contains("ProfileURL")) if (requestData.Contains("ProfileURL"))

10
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -3100,11 +3100,11 @@ namespace OpenSim.Region.ClientStack
{ {
AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData; AvatarPropertiesUpdatePacket.PropertiesDataBlock Properties = Packet.PropertiesData;
UserProfileData UserProfile = new UserProfileData(); UserProfileData UserProfile = new UserProfileData();
UserProfile.Id = AgentId; UserProfile.ID = AgentId;
UserProfile.ProfileAboutText = Helpers.FieldToUTF8String(Properties.AboutText); UserProfile.AboutText = Helpers.FieldToUTF8String(Properties.AboutText);
UserProfile.ProfileFirstText = Helpers.FieldToUTF8String(Properties.FLAboutText); UserProfile.FirstLifeAboutText = Helpers.FieldToUTF8String(Properties.FLAboutText);
UserProfile.ProfileFirstImage = Properties.FLImageID; UserProfile.FirstLifeImage = Properties.FLImageID;
UserProfile.ProfileImage = Properties.ImageID; UserProfile.Image = Properties.ImageID;
handlerUpdateAvatarProperties(this, UserProfile); handlerUpdateAvatarProperties(this, UserProfile);
} }

4
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

@ -149,8 +149,8 @@ namespace OpenSim.Region.ClientStack
if (masterAvatar != null) if (masterAvatar != null)
{ {
m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.Id.ToString() + "]"); m_log.Info("[PARCEL]: Found master avatar [" + masterAvatar.ID.ToString() + "]");
scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.Id; scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
} }
else else
{ {

4
OpenSim/Region/Communications/Local/LocalLoginService.cs
View File

@ -87,7 +87,7 @@ namespace OpenSim.Region.Communications.Local
profile = m_userManager.GetUserProfile(firstname, lastname); profile = m_userManager.GetUserProfile(firstname, lastname);
if (profile != null) if (profile != null)
{ {
m_Parent.InventoryService.CreateNewUserInventory(profile.Id); m_Parent.InventoryService.CreateNewUserInventory(profile.ID);
} }
return profile; return profile;
@ -169,7 +169,7 @@ namespace OpenSim.Region.Communications.Local
LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList(); LoginResponse.BuddyList buddyList = new LoginResponse.BuddyList();
response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.Id)); response.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(theUser.ID));
Login _login = new Login(); Login _login = new Login();
//copy data to login object //copy data to login object

2
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -84,7 +84,7 @@ namespace OpenSim.Region.Communications.Local
} }
else else
{ {
m_inventoryService.CreateNewUserInventory(profile.Id); m_inventoryService.CreateNewUserInventory(profile.ID);
} }
return profile; return profile;

24
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -62,15 +62,15 @@ namespace OpenSim.Region.Communications.OGS1
UserProfileData userData = new UserProfileData(); UserProfileData userData = new UserProfileData();
userData.FirstName = (string) data["firstname"]; userData.FirstName = (string) data["firstname"];
userData.SurName = (string) data["lastname"]; userData.SurName = (string) data["lastname"];
userData.Id = new LLUUID((string) data["uuid"]); userData.ID = new LLUUID((string) data["uuid"]);
userData.UserInventoryURI = (string) data["server_inventory"]; userData.UserInventoryURI = (string) data["server_inventory"];
userData.UserAssetURI = (string) data["server_asset"]; userData.UserAssetURI = (string) data["server_asset"];
userData.ProfileFirstText = (string) data["profile_firstlife_about"]; userData.FirstLifeAboutText = (string) data["profile_firstlife_about"];
userData.ProfileFirstImage = new LLUUID((string) data["profile_firstlife_image"]); userData.FirstLifeImage = new LLUUID((string) data["profile_firstlife_image"]);
userData.ProfileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
userData.ProfileWantDoMask = Convert.ToUInt32(data["profile_want_do"]); userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
userData.ProfileAboutText = (string)data["profile_about"]; userData.AboutText = (string)data["profile_about"];
userData.ProfileImage = new LLUUID((string) data["profile_image"]); userData.Image = new LLUUID((string) data["profile_image"]);
userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]);
userData.HomeLocation = userData.HomeLocation =
@ -306,13 +306,13 @@ namespace OpenSim.Region.Communications.OGS1
{ {
m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile."); m_log.Debug("[OGS1 USER SERVICES]: Asking UserServer to update profile.");
Hashtable param = new Hashtable(); Hashtable param = new Hashtable();
param["avatar_uuid"] = UserProfile.Id.ToString(); param["avatar_uuid"] = UserProfile.ID.ToString();
//param["AllowPublish"] = UserProfile.ToString(); //param["AllowPublish"] = UserProfile.ToString();
param["FLImageID"] = UserProfile.ProfileFirstImage.ToString(); param["FLImageID"] = UserProfile.FirstLifeImage.ToString();
param["ImageID"] = UserProfile.ProfileImage.ToString(); param["ImageID"] = UserProfile.Image.ToString();
//param["MaturePublish"] = MaturePublish.ToString(); //param["MaturePublish"] = MaturePublish.ToString();
param["AboutText"] = UserProfile.ProfileAboutText; param["AboutText"] = UserProfile.AboutText;
param["FLAboutText"] = UserProfile.ProfileFirstText; param["FLAboutText"] = UserProfile.FirstLifeAboutText;
//param["ProfileURL"] = UserProfile.ProfileURL.ToString(); //param["ProfileURL"] = UserProfile.ProfileURL.ToString();
IList parameters = new ArrayList(); IList parameters = new ArrayList();
parameters.Add(param); parameters.Add(param);

20
OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
View File

@ -90,10 +90,10 @@ namespace OpenSim.Region.Environment.Modules
UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID);
if (null != profile) if (null != profile)
{ {
remoteClient.SendAvatarProperties(profile.Id, profile.ProfileAboutText, remoteClient.SendAvatarProperties(profile.ID, profile.AboutText,
Util.ToDateTime(profile.Created).ToString(), Util.ToDateTime(profile.Created).ToString(),
System.String.Empty, profile.ProfileFirstText, profile.ProfileCanDoMask, System.String.Empty, profile.FirstLifeAboutText, profile.CanDoMask,
profile.ProfileFirstImage, profile.ProfileImage, System.String.Empty, partner); profile.FirstLifeImage, profile.Image, System.String.Empty, partner);
} }
else else
{ {
@ -103,15 +103,15 @@ namespace OpenSim.Region.Environment.Modules
public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
{ {
UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.Id); UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
// if it's the profile of the user requesting the update, then we change only a few things. // if it's the profile of the user requesting the update, then we change only a few things.
if (remoteClient.AgentId.CompareTo(Profile.Id) == 0) if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
{ {
Profile.ProfileImage = newProfile.ProfileImage; Profile.Image = newProfile.Image;
Profile.ProfileFirstImage = newProfile.ProfileFirstImage; Profile.FirstLifeImage = newProfile.FirstLifeImage;
Profile.ProfileAboutText = newProfile.ProfileAboutText; Profile.AboutText = newProfile.AboutText;
Profile.ProfileFirstText = newProfile.ProfileFirstText; Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
} }
else else
{ {
@ -119,7 +119,7 @@ namespace OpenSim.Region.Environment.Modules
} }
if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile)) if (m_scene.CommsManager.UserService.UpdateUserProfileProperties(Profile))
{ {
RequestAvatarProperty(remoteClient, newProfile.Id); RequestAvatarProperty(remoteClient, newProfile.ID);
} }
} }
} }