aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 00:04:37 +0000
committerMelanie Thielker2008-08-14 00:04:37 +0000
commite3157e61aa50d057b4345cb9d49c973afeb26b15 (patch)
tree8452565ff0d7e6c3d07541743e0e5f665bc7d03c /OpenSim/Data/SQLite
parent* minor: make it clear on the console when a client is being logged out becau... (diff)
downloadopensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.zip
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.gz
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.bz2
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.xz
Mantis #1946
Thank you, HomerHorwitz, for a patch that corrects and improves TP to landmark and home position handling.
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index 45b4dc6..21c9dbc 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -662,6 +662,7 @@ namespace OpenSim.Data.SQLite
662 662
663 SQLiteUtil.createCol(users, "homeRegionX", typeof (Int32)); 663 SQLiteUtil.createCol(users, "homeRegionX", typeof (Int32));
664 SQLiteUtil.createCol(users, "homeRegionY", typeof (Int32)); 664 SQLiteUtil.createCol(users, "homeRegionY", typeof (Int32));
665 SQLiteUtil.createCol(users, "homeRegionID", typeof (String));
665 SQLiteUtil.createCol(users, "homeLocationX", typeof (Double)); 666 SQLiteUtil.createCol(users, "homeLocationX", typeof (Double));
666 SQLiteUtil.createCol(users, "homeLocationY", typeof (Double)); 667 SQLiteUtil.createCol(users, "homeLocationY", typeof (Double));
667 SQLiteUtil.createCol(users, "homeLocationZ", typeof (Double)); 668 SQLiteUtil.createCol(users, "homeLocationZ", typeof (Double));
@@ -769,6 +770,11 @@ namespace OpenSim.Data.SQLite
769 Convert.ToSingle(row["homeLookAtY"]), 770 Convert.ToSingle(row["homeLookAtY"]),
770 Convert.ToSingle(row["homeLookAtZ"]) 771 Convert.ToSingle(row["homeLookAtZ"])
771 ); 772 );
773
774 LLUUID regionID = LLUUID.Zero;
775 LLUUID.TryParse(row["homeRegionID"].ToString(), out regionID); // it's ok if it doesn't work; just use LLUUID.Zero
776 user.HomeRegionID = regionID;
777
772 user.Created = Convert.ToInt32(row["created"]); 778 user.Created = Convert.ToInt32(row["created"]);
773 user.LastLogin = Convert.ToInt32(row["lastLogin"]); 779 user.LastLogin = Convert.ToInt32(row["lastLogin"]);
774 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]); 780 user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
@@ -803,6 +809,7 @@ namespace OpenSim.Data.SQLite
803 809
804 row["homeRegionX"] = user.HomeRegionX; 810 row["homeRegionX"] = user.HomeRegionX;
805 row["homeRegionY"] = user.HomeRegionY; 811 row["homeRegionY"] = user.HomeRegionY;
812 row["homeRegionID"] = user.HomeRegionID;
806 row["homeLocationX"] = user.HomeLocation.X; 813 row["homeLocationX"] = user.HomeLocation.X;
807 row["homeLocationY"] = user.HomeLocation.Y; 814 row["homeLocationY"] = user.HomeLocation.Y;
808 row["homeLocationZ"] = user.HomeLocation.Z; 815 row["homeLocationZ"] = user.HomeLocation.Z;