aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorAliciaRaven2015-03-31 12:35:55 +0100
committerMichael Cerquoni2015-04-12 15:36:22 -0400
commit1e444b1449ffad4969709c039f7c606c9f8f484d (patch)
tree51187c4212cc2397a9b6c1af9a657cba0335a734 /OpenSim/Data/SQLite
parentFix llTargetOmega non-physical gain. (diff)
downloadopensim-SC-1e444b1449ffad4969709c039f7c606c9f8f484d.zip
opensim-SC-1e444b1449ffad4969709c039f7c606c9f8f484d.tar.gz
opensim-SC-1e444b1449ffad4969709c039f7c606c9f8f484d.tar.bz2
opensim-SC-1e444b1449ffad4969709c039f7c606c9f8f484d.tar.xz
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>
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 790843b..cd3e8b6 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -368,7 +368,7 @@ namespace OpenSim.Data.SQLite
368 bool.TryParse((string)reader["enabled"].ToString(), out pick.Enabled); 368 bool.TryParse((string)reader["enabled"].ToString(), out pick.Enabled);
369 pick.Name = (string)reader["name"]; 369 pick.Name = (string)reader["name"];
370 pick.Desc = description; 370 pick.Desc = description;
371 pick.User = (string)reader["user"]; 371 pick.ParcelName = (string)reader["user"];
372 pick.OriginalName = (string)reader["originalname"]; 372 pick.OriginalName = (string)reader["originalname"];
373 pick.SimName = (string)reader["simname"]; 373 pick.SimName = (string)reader["simname"];
374 pick.SortOrder = (int)reader["sortorder"]; 374 pick.SortOrder = (int)reader["sortorder"];
@@ -434,7 +434,7 @@ namespace OpenSim.Data.SQLite
434 cmd.Parameters.AddWithValue(":Name", pick.Name.ToString()); 434 cmd.Parameters.AddWithValue(":Name", pick.Name.ToString());
435 cmd.Parameters.AddWithValue(":Desc", pick.Desc.ToString()); 435 cmd.Parameters.AddWithValue(":Desc", pick.Desc.ToString());
436 cmd.Parameters.AddWithValue(":SnapshotId", pick.SnapshotId.ToString()); 436 cmd.Parameters.AddWithValue(":SnapshotId", pick.SnapshotId.ToString());
437 cmd.Parameters.AddWithValue(":User", pick.User.ToString()); 437 cmd.Parameters.AddWithValue(":User", pick.ParcelName.ToString());
438 cmd.Parameters.AddWithValue(":Original", pick.OriginalName.ToString()); 438 cmd.Parameters.AddWithValue(":Original", pick.OriginalName.ToString());
439 cmd.Parameters.AddWithValue(":SimName",pick.SimName.ToString()); 439 cmd.Parameters.AddWithValue(":SimName",pick.SimName.ToString());
440 cmd.Parameters.AddWithValue(":GlobalPos", pick.GlobalPos); 440 cmd.Parameters.AddWithValue(":GlobalPos", pick.GlobalPos);