aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs20
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs20
-rw-r--r--OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml17
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs20
4 files changed, 47 insertions, 30 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 0ae879a..3f85fef 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -973,11 +973,11 @@ namespace OpenSim.Data.MSSQL
973 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 973 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]);
974 taskItem.GroupID = new LLUUID((String)row["groupID"]); 974 taskItem.GroupID = new LLUUID((String)row["groupID"]);
975 975
976 taskItem.NextOwnerMask = Convert.ToUInt32(row["nextPermissions"]); 976 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
977 taskItem.OwnerMask = Convert.ToUInt32(row["currentPermissions"]); 977 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
978 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 978 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]);
979 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 979 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]);
980 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 980 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]);
981// taskItem.Flags = Convert.ToUInt32(row["flags"]); 981// taskItem.Flags = Convert.ToUInt32(row["flags"]);
982 982
983 return taskItem; 983 return taskItem;
@@ -1170,11 +1170,11 @@ namespace OpenSim.Data.MSSQL
1170 row["ownerID"] = taskItem.OwnerID; 1170 row["ownerID"] = taskItem.OwnerID;
1171 row["lastOwnerID"] = taskItem.LastOwnerID; 1171 row["lastOwnerID"] = taskItem.LastOwnerID;
1172 row["groupID"] = taskItem.GroupID; 1172 row["groupID"] = taskItem.GroupID;
1173 row["nextPermissions"] = taskItem.NextOwnerMask; 1173 row["nextPermissions"] = taskItem.NextPermissions;
1174 row["currentPermissions"] = taskItem.OwnerMask; 1174 row["currentPermissions"] = taskItem.CurrentPermissions;
1175 row["basePermissions"] = taskItem.BaseMask; 1175 row["basePermissions"] = taskItem.BasePermissions;
1176 row["everyonePermissions"] = taskItem.EveryoneMask; 1176 row["everyonePermissions"] = taskItem.EveryonePermissions;
1177 row["groupPermissions"] = taskItem.GroupMask; 1177 row["groupPermissions"] = taskItem.GroupPermissions;
1178// row["flags"] = taskItem.Flags; 1178// row["flags"] = taskItem.Flags;
1179 } 1179 }
1180 1180
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 2ace4b1..7482df3 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1258,11 +1258,11 @@ namespace OpenSim.Data.MySQL
1258 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1258 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]);
1259 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1259 taskItem.GroupID = new LLUUID((String)row["groupID"]);
1260 1260
1261 taskItem.NextOwnerMask = Convert.ToUInt32(row["nextPermissions"]); 1261 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1262 taskItem.OwnerMask = Convert.ToUInt32(row["currentPermissions"]); 1262 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
1263 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 1263 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]);
1264 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 1264 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]);
1265 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 1265 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]);
1266 taskItem.Flags = Convert.ToUInt32(row["flags"]); 1266 taskItem.Flags = Convert.ToUInt32(row["flags"]);
1267 1267
1268 return taskItem; 1268 return taskItem;
@@ -1519,11 +1519,11 @@ namespace OpenSim.Data.MySQL
1519 row["ownerID"] = taskItem.OwnerID; 1519 row["ownerID"] = taskItem.OwnerID;
1520 row["lastOwnerID"] = taskItem.LastOwnerID; 1520 row["lastOwnerID"] = taskItem.LastOwnerID;
1521 row["groupID"] = taskItem.GroupID; 1521 row["groupID"] = taskItem.GroupID;
1522 row["nextPermissions"] = taskItem.NextOwnerMask; 1522 row["nextPermissions"] = taskItem.NextPermissions;
1523 row["currentPermissions"] = taskItem.OwnerMask; 1523 row["currentPermissions"] = taskItem.CurrentPermissions;
1524 row["basePermissions"] = taskItem.BaseMask; 1524 row["basePermissions"] = taskItem.BasePermissions;
1525 row["everyonePermissions"] = taskItem.EveryoneMask; 1525 row["everyonePermissions"] = taskItem.EveryonePermissions;
1526 row["groupPermissions"] = taskItem.GroupMask; 1526 row["groupPermissions"] = taskItem.GroupPermissions;
1527 row["flags"] = taskItem.Flags; 1527 row["flags"] = taskItem.Flags;
1528 } 1528 }
1529 1529
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index 9fc8065..00bf841 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -110,4 +110,21 @@
110 </id> 110 </id>
111 <property name="Map" type="System.Byte[]" /> 111 <property name="Map" type="System.Byte[]" />
112 </class> 112 </class>
113 <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false">
114 <id name="ItemID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
115 <generator class="assigned" />
116 </id>
117 <property name="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
118 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
119 <property name="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
120 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
121 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
122 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
123 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
124 <property name="CurrentPermissions" type="System.UInt32" />
125 <property name="BasePermissions" type="System.UInt32" />
126 <property name="EveryonePermissions" type="System.UInt32" />
127 <property name="GroupPermissions" type="System.UInt32" />
128 <property name="NextPermissions" type="System.UInt32" />
129 </class>
113</hibernate-mapping> \ No newline at end of file 130</hibernate-mapping> \ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 0f9323b..f780d1d 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1014,11 +1014,11 @@ namespace OpenSim.Data.SQLite
1014 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]); 1014 taskItem.LastOwnerID = new LLUUID((String)row["lastOwnerID"]);
1015 taskItem.GroupID = new LLUUID((String)row["groupID"]); 1015 taskItem.GroupID = new LLUUID((String)row["groupID"]);
1016 1016
1017 taskItem.NextOwnerMask = Convert.ToUInt32(row["nextPermissions"]); 1017 taskItem.NextPermissions = Convert.ToUInt32(row["nextPermissions"]);
1018 taskItem.OwnerMask = Convert.ToUInt32(row["currentPermissions"]); 1018 taskItem.CurrentPermissions = Convert.ToUInt32(row["currentPermissions"]);
1019 taskItem.BaseMask = Convert.ToUInt32(row["basePermissions"]); 1019 taskItem.BasePermissions = Convert.ToUInt32(row["basePermissions"]);
1020 taskItem.EveryoneMask = Convert.ToUInt32(row["everyonePermissions"]); 1020 taskItem.EveryonePermissions = Convert.ToUInt32(row["everyonePermissions"]);
1021 taskItem.GroupMask = Convert.ToUInt32(row["groupPermissions"]); 1021 taskItem.GroupPermissions = Convert.ToUInt32(row["groupPermissions"]);
1022 taskItem.Flags = Convert.ToUInt32(row["flags"]); 1022 taskItem.Flags = Convert.ToUInt32(row["flags"]);
1023 1023
1024 return taskItem; 1024 return taskItem;
@@ -1254,11 +1254,11 @@ namespace OpenSim.Data.SQLite
1254 row["ownerID"] = taskItem.OwnerID; 1254 row["ownerID"] = taskItem.OwnerID;
1255 row["lastOwnerID"] = taskItem.LastOwnerID; 1255 row["lastOwnerID"] = taskItem.LastOwnerID;
1256 row["groupID"] = taskItem.GroupID; 1256 row["groupID"] = taskItem.GroupID;
1257 row["nextPermissions"] = taskItem.NextOwnerMask; 1257 row["nextPermissions"] = taskItem.NextPermissions;
1258 row["currentPermissions"] = taskItem.OwnerMask; 1258 row["currentPermissions"] = taskItem.CurrentPermissions;
1259 row["basePermissions"] = taskItem.BaseMask; 1259 row["basePermissions"] = taskItem.BasePermissions;
1260 row["everyonePermissions"] = taskItem.EveryoneMask; 1260 row["everyonePermissions"] = taskItem.EveryonePermissions;
1261 row["groupPermissions"] = taskItem.GroupMask; 1261 row["groupPermissions"] = taskItem.GroupPermissions;
1262 row["flags"] = taskItem.Flags; 1262 row["flags"] = taskItem.Flags;
1263 } 1263 }
1264 1264
generated by cgit v1.1 at 2024-07-18 05:00:41 +0000