Change UserProfiles so that the parcel name is used for a ProfilePick and not the parcel owners name. This change also fixes a bug where if the avatar enters and does not move, creating or editing a ProfilePick would set the parcelId as an empty UUID. This is because ScenePresence.currentParcelUUID is not set until the avatar moves.

Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index d00c3cf..a003e07 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -385,7 +385,7 @@ namespace OpenSim.Data.PGSQL
                                 pick.Enabled = Convert.ToBoolean(reader["enabled"]);
                                 pick.Name = reader["name"].ToString ();
                                 pick.Desc = reader["description"].ToString();
-                                pick.User = reader["user"].ToString();
+                                pick.ParcelName = reader["user"].ToString();
                                 pick.OriginalName = reader["originalname"].ToString();
                                 pick.SimName = reader["simname"].ToString();
                                 pick.SortOrder = (int)reader["sortorder"];
@@ -437,7 +437,7 @@ namespace OpenSim.Data.PGSQL
                         cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name));
                         cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc));
                         cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId));
-                        cmd.Parameters.Add(m_database.CreateParameter("User", pick.User));
+                        cmd.Parameters.Add(m_database.CreateParameter("User", pick.ParcelName));
                         cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName));
                         cmd.Parameters.Add(m_database.CreateParameter("SimName",pick.SimName));
                         cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos));