Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-08-18 00:59:20 +0100
committer: Melanie 2010-08-18 00:59:20 +0100
commit: e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree: 3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Data/SQLiteLegacy
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download: opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2
opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
index eb78037..289fd94 100644
--- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
@@ -1187,7 +1187,7 @@ namespace OpenSim.Data.SQLiteLegacy
            prim.SitName = (String) row["SitName"];
            prim.TouchName = (String) row["TouchName"];
            // permissions
-            prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
+            prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]);
            prim.CreatorID = new UUID((String) row["CreatorID"]);
            prim.OwnerID = new UUID((String) row["OwnerID"]);
            prim.GroupID = new UUID((String) row["GroupID"]);
@@ -1521,7 +1521,7 @@ namespace OpenSim.Data.SQLiteLegacy
            row["SitName"] = prim.SitName;
            row["TouchName"] = prim.TouchName;
            // permissions
-            row["ObjectFlags"] = prim.ObjectFlags;
+            row["ObjectFlags"] = (uint)prim.Flags;
            row["CreatorID"] = prim.CreatorID.ToString();
            row["OwnerID"] = prim.OwnerID.ToString();
            row["GroupID"] = prim.GroupID.ToString();
author	Melanie	2010-08-18 00:59:20 +0100
committer	Melanie	2010-08-18 00:59:20 +0100
commit	e74809ff4c7fd67ceb5336e5d8e7811591f6cce3 (patch)
tree	3e878fb80be75106631d76a12b8da9e65e98f7b9 /OpenSim/Data/SQLiteLegacy
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t... (diff)
download	opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2 opensim-SC_OLD-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz

diff --git a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs index eb78037..289fd94 100644 --- a/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs +++ b/OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs
@@ -1187,7 +1187,7 @@ namespace OpenSim.Data.SQLiteLegacy
1187	prim.SitName = (String) row["SitName"];	1187	prim.SitName = (String) row["SitName"];
1188	prim.TouchName = (String) row["TouchName"];	1188	prim.TouchName = (String) row["TouchName"];
1189	// permissions	1189	// permissions
1190	prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);	1190	prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]);
1191	prim.CreatorID = new UUID((String) row["CreatorID"]);	1191	prim.CreatorID = new UUID((String) row["CreatorID"]);
1192	prim.OwnerID = new UUID((String) row["OwnerID"]);	1192	prim.OwnerID = new UUID((String) row["OwnerID"]);
1193	prim.GroupID = new UUID((String) row["GroupID"]);	1193	prim.GroupID = new UUID((String) row["GroupID"]);
@@ -1521,7 +1521,7 @@ namespace OpenSim.Data.SQLiteLegacy
1521	row["SitName"] = prim.SitName;	1521	row["SitName"] = prim.SitName;
1522	row["TouchName"] = prim.TouchName;	1522	row["TouchName"] = prim.TouchName;
1523	// permissions	1523	// permissions
1524	row["ObjectFlags"] = prim.ObjectFlags;	1524	row["ObjectFlags"] = (uint)prim.Flags;
1525	row["CreatorID"] = prim.CreatorID.ToString();	1525	row["CreatorID"] = prim.CreatorID.ToString();
1526	row["OwnerID"] = prim.OwnerID.ToString();	1526	row["OwnerID"] = prim.OwnerID.ToString();
1527	row["GroupID"] = prim.GroupID.ToString();	1527	row["GroupID"] = prim.GroupID.ToString();