aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserProfiles.cs
diff options
context:
space:
mode:
authorAliciaRaven2015-03-31 12:35:55 +0100
committerMichael Cerquoni2015-04-12 15:36:22 -0400
commit1e444b1449ffad4969709c039f7c606c9f8f484d (patch)
tree51187c4212cc2397a9b6c1af9a657cba0335a734 /OpenSim/Framework/UserProfiles.cs
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/Framework/UserProfiles.cs')
-rw-r--r--OpenSim/Framework/UserProfiles.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index bfc2f6b..98ab651 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
77 public string Desc = string.Empty; 77 public string Desc = string.Empty;
78 public UUID ParcelId = UUID.Zero; 78 public UUID ParcelId = UUID.Zero;
79 public UUID SnapshotId = UUID.Zero; 79 public UUID SnapshotId = UUID.Zero;
80 public string User = string.Empty; 80 public string ParcelName = string.Empty;
81 public string SimName = string.Empty; 81 public string SimName = string.Empty;
82 public string GlobalPos = "<0,0,0>"; 82 public string GlobalPos = "<0,0,0>";
83 public string Gatekeeper = string.Empty; 83 public string Gatekeeper = string.Empty;