aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserProfilesData.cs6
-rw-r--r--OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs4
-rw-r--r--OpenSim/Framework/UserProfiles.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs26
5 files changed, 18 insertions, 24 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
index 86f2efe..b35595d 100644
--- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -402,7 +402,7 @@ namespace OpenSim.Data.MySQL
402 bool.TryParse((string)reader["enabled"], out pick.Enabled); 402 bool.TryParse((string)reader["enabled"], out pick.Enabled);
403 pick.Name = (string)reader["name"]; 403 pick.Name = (string)reader["name"];
404 pick.Desc = description; 404 pick.Desc = description;
405 pick.User = (string)reader["user"]; 405 pick.ParcelName = (string)reader["user"];
406 pick.OriginalName = (string)reader["originalname"]; 406 pick.OriginalName = (string)reader["originalname"];
407 pick.SimName = (string)reader["simname"]; 407 pick.SimName = (string)reader["simname"];
408 pick.SortOrder = (int)reader["sortorder"]; 408 pick.SortOrder = (int)reader["sortorder"];
@@ -443,6 +443,8 @@ namespace OpenSim.Data.MySQL
443 query += "parceluuid=?ParcelId,"; 443 query += "parceluuid=?ParcelId,";
444 query += "name=?Name,"; 444 query += "name=?Name,";
445 query += "description=?Desc,"; 445 query += "description=?Desc,";
446 query += "user=?User,";
447 query += "simname=?SimName,";
446 query += "snapshotuuid=?SnapshotId,"; 448 query += "snapshotuuid=?SnapshotId,";
447 query += "pickuuid=?PickId,"; 449 query += "pickuuid=?PickId,";
448 query += "posglobal=?GlobalPos,"; 450 query += "posglobal=?GlobalPos,";
@@ -462,7 +464,7 @@ namespace OpenSim.Data.MySQL
462 cmd.Parameters.AddWithValue("?Name", pick.Name.ToString()); 464 cmd.Parameters.AddWithValue("?Name", pick.Name.ToString());
463 cmd.Parameters.AddWithValue("?Desc", pick.Desc.ToString()); 465 cmd.Parameters.AddWithValue("?Desc", pick.Desc.ToString());
464 cmd.Parameters.AddWithValue("?SnapshotId", pick.SnapshotId.ToString()); 466 cmd.Parameters.AddWithValue("?SnapshotId", pick.SnapshotId.ToString());
465 cmd.Parameters.AddWithValue("?User", pick.User.ToString()); 467 cmd.Parameters.AddWithValue("?User", pick.ParcelName.ToString());
466 cmd.Parameters.AddWithValue("?Original", pick.OriginalName.ToString()); 468 cmd.Parameters.AddWithValue("?Original", pick.OriginalName.ToString());
467 cmd.Parameters.AddWithValue("?SimName",pick.SimName.ToString()); 469 cmd.Parameters.AddWithValue("?SimName",pick.SimName.ToString());
468 cmd.Parameters.AddWithValue("?GlobalPos", pick.GlobalPos); 470 cmd.Parameters.AddWithValue("?GlobalPos", pick.GlobalPos);
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
385 pick.Enabled = Convert.ToBoolean(reader["enabled"]); 385 pick.Enabled = Convert.ToBoolean(reader["enabled"]);
386 pick.Name = reader["name"].ToString (); 386 pick.Name = reader["name"].ToString ();
387 pick.Desc = reader["description"].ToString(); 387 pick.Desc = reader["description"].ToString();
388 pick.User = reader["user"].ToString(); 388 pick.ParcelName = reader["user"].ToString();
389 pick.OriginalName = reader["originalname"].ToString(); 389 pick.OriginalName = reader["originalname"].ToString();
390 pick.SimName = reader["simname"].ToString(); 390 pick.SimName = reader["simname"].ToString();
391 pick.SortOrder = (int)reader["sortorder"]; 391 pick.SortOrder = (int)reader["sortorder"];
@@ -437,7 +437,7 @@ namespace OpenSim.Data.PGSQL
437 cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name)); 437 cmd.Parameters.Add(m_database.CreateParameter("Name", pick.Name));
438 cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc)); 438 cmd.Parameters.Add(m_database.CreateParameter("Desc", pick.Desc));
439 cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId)); 439 cmd.Parameters.Add(m_database.CreateParameter("SnapshotId", pick.SnapshotId));
440 cmd.Parameters.Add(m_database.CreateParameter("User", pick.User)); 440 cmd.Parameters.Add(m_database.CreateParameter("User", pick.ParcelName));
441 cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName)); 441 cmd.Parameters.Add(m_database.CreateParameter("Original", pick.OriginalName));
442 cmd.Parameters.Add(m_database.CreateParameter("SimName",pick.SimName)); 442 cmd.Parameters.Add(m_database.CreateParameter("SimName",pick.SimName));
443 cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos)); 443 cmd.Parameters.Add(m_database.CreateParameter("GlobalPos", pick.GlobalPos));
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);
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;
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
index 48bb2df..5a648a3 100644
--- a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -671,7 +671,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
671 671
672 // Pull the rabbit out of the hat 672 // Pull the rabbit out of the hat
673 remoteClient.SendPickInfoReply(pick.PickId,pick.CreatorId,pick.TopPick,pick.ParcelId,pick.Name, 673 remoteClient.SendPickInfoReply(pick.PickId,pick.CreatorId,pick.TopPick,pick.ParcelId,pick.Name,
674 pick.Desc,pick.SnapshotId,pick.User,pick.OriginalName,pick.SimName, 674 pick.Desc,pick.SnapshotId,pick.ParcelName,pick.OriginalName,pick.SimName,
675 globalPos,pick.SortOrder,pick.Enabled); 675 globalPos,pick.SortOrder,pick.Enabled);
676 } 676 }
677 677
@@ -721,24 +721,16 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
721 remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y, 721 remoteClient.Scene.RegionInfo.WorldLocY + avaPos.Y,
722 avaPos.Z); 722 avaPos.Z);
723 723
724 string landOwnerName = string.Empty; 724 string landParcelName = "My Parcel";
725 UUID landParcelID = p.currentParcelUUID;
726
725 ILandObject land = p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y); 727 ILandObject land = p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y);
726 728
727 if (land != null) 729 if (land != null)
728 { 730 {
729 if (land.LandData.IsGroupOwned) 731 // If land found, use parcel uuid from here because the value from SP will be blank if the avatar hasnt moved
730 { 732 landParcelName = land.LandData.Name;
731 IGroupsModule groupMod = p.Scene.RequestModuleInterface<IGroupsModule>(); 733 landParcelID = land.LandData.GlobalID;
732 UUID groupId = land.LandData.GroupID;
733 GroupRecord groupRecord = groupMod.GetGroupRecord(groupId);
734 landOwnerName = groupRecord.GroupName;
735 }
736 else
737 {
738 IUserAccountService accounts = p.Scene.RequestModuleInterface<IUserAccountService>();
739 UserAccount user = accounts.GetUserAccount(p.Scene.RegionInfo.ScopeID, land.LandData.OwnerID);
740 landOwnerName = user.Name;
741 }
742 } 734 }
743 else 735 else
744 { 736 {
@@ -753,9 +745,9 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
753 pick.TopPick = topPick; 745 pick.TopPick = topPick;
754 pick.Name = name; 746 pick.Name = name;
755 pick.Desc = desc; 747 pick.Desc = desc;
756 pick.ParcelId = p.currentParcelUUID; 748 pick.ParcelId = landParcelID;
757 pick.SnapshotId = snapshotID; 749 pick.SnapshotId = snapshotID;
758 pick.User = landOwnerName; 750 pick.ParcelName = landParcelName;
759 pick.SimName = remoteClient.Scene.RegionInfo.RegionName; 751 pick.SimName = remoteClient.Scene.RegionInfo.RegionName;
760 pick.Gatekeeper = MyGatekeeper; 752 pick.Gatekeeper = MyGatekeeper;
761 pick.GlobalPos = posGlobal.ToString(); 753 pick.GlobalPos = posGlobal.ToString();