aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteUserData.cs
diff options
context:
space:
mode:
authorKunnis2009-12-05 09:54:33 -0600
committerMelanie2009-12-06 03:57:15 +0000
commit4c61fcfc401cdf08f5027e3bce21c4b465711c60 (patch)
tree8f32d613f2eb0ddcc9ec68afa06542a45dbd556d /OpenSim/Data/SQLite/SQLiteUserData.cs
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.zip
opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.gz
opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.bz2
opensim-SC-4c61fcfc401cdf08f5027e3bce21c4b465711c60.tar.xz
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserData.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index b9f3515..caddcf8 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -819,7 +819,10 @@ namespace OpenSim.Data.SQLite
819 SQLiteUtil.createCol(users, "homeLookAtZ", typeof (Double)); 819 SQLiteUtil.createCol(users, "homeLookAtZ", typeof (Double));
820 SQLiteUtil.createCol(users, "created", typeof (Int32)); 820 SQLiteUtil.createCol(users, "created", typeof (Int32));
821 SQLiteUtil.createCol(users, "lastLogin", typeof (Int32)); 821 SQLiteUtil.createCol(users, "lastLogin", typeof (Int32));
822
823 //TODO: Please delete this column. It's now a brick
822 SQLiteUtil.createCol(users, "rootInventoryFolderID", typeof (String)); 824 SQLiteUtil.createCol(users, "rootInventoryFolderID", typeof (String));
825
823 SQLiteUtil.createCol(users, "userInventoryURI", typeof (String)); 826 SQLiteUtil.createCol(users, "userInventoryURI", typeof (String));
824 SQLiteUtil.createCol(users, "userAssetURI", typeof (String)); 827 SQLiteUtil.createCol(users, "userAssetURI", typeof (String));
825 SQLiteUtil.createCol(users, "profileCanDoMask", typeof (Int32)); 828 SQLiteUtil.createCol(users, "profileCanDoMask", typeof (Int32));
@@ -980,7 +983,6 @@ namespace OpenSim.Data.SQLite
980 983
981 user.Created = Convert.ToInt32(row["created"]); 984 user.Created = Convert.ToInt32(row["created"]);
982 user.LastLogin = Convert.ToInt32(row["lastLogin"]); 985 user.LastLogin = Convert.ToInt32(row["lastLogin"]);
983 user.RootInventoryFolderID = new UUID((String) row["rootInventoryFolderID"]);
984 user.UserInventoryURI = (String) row["userInventoryURI"]; 986 user.UserInventoryURI = (String) row["userInventoryURI"];
985 user.UserAssetURI = (String) row["userAssetURI"]; 987 user.UserAssetURI = (String) row["userAssetURI"];
986 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]); 988 user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
@@ -1026,7 +1028,8 @@ namespace OpenSim.Data.SQLite
1026 1028
1027 row["created"] = user.Created; 1029 row["created"] = user.Created;
1028 row["lastLogin"] = user.LastLogin; 1030 row["lastLogin"] = user.LastLogin;
1029 row["rootInventoryFolderID"] = user.RootInventoryFolderID.ToString(); 1031 //TODO: Get rid of rootInventoryFolderID in a safe way.
1032 row["rootInventoryFolderID"] = UUID.Zero.ToString();
1030 row["userInventoryURI"] = user.UserInventoryURI; 1033 row["userInventoryURI"] = user.UserInventoryURI;
1031 row["userAssetURI"] = user.UserAssetURI; 1034 row["userAssetURI"] = user.UserAssetURI;
1032 row["profileCanDoMask"] = user.CanDoMask; 1035 row["profileCanDoMask"] = user.CanDoMask;