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/MSSQL
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-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2
opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index 7c176c7..7d017a6 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -1017,7 +1017,7 @@ VALUES
            prim.SitName = (string)primRow["SitName"];
            prim.TouchName = (string)primRow["TouchName"];
            // permissions
-            prim.ObjectFlags = Convert.ToUInt32(primRow["ObjectFlags"]);
+            prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
            prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
            prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
            prim.GroupID = new UUID((Guid)primRow["GroupID"]);
@@ -1408,7 +1408,7 @@ VALUES
            parameters.Add(_Database.CreateParameter("SitName", prim.SitName));
            parameters.Add(_Database.CreateParameter("TouchName", prim.TouchName));
            // permissions
-            parameters.Add(_Database.CreateParameter("ObjectFlags", prim.ObjectFlags));
+            parameters.Add(_Database.CreateParameter("ObjectFlags", (uint)prim.Flags));
            parameters.Add(_Database.CreateParameter("CreatorID", prim.CreatorID));
            parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
            parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));
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/MSSQL
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-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.zip opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.gz opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.bz2 opensim-SC-e74809ff4c7fd67ceb5336e5d8e7811591f6cce3.tar.xz

diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs index 7c176c7..7d017a6 100644 --- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -1017,7 +1017,7 @@ VALUES
1017	prim.SitName = (string)primRow["SitName"];	1017	prim.SitName = (string)primRow["SitName"];
1018	prim.TouchName = (string)primRow["TouchName"];	1018	prim.TouchName = (string)primRow["TouchName"];
1019	// permissions	1019	// permissions
1020	prim.ObjectFlags = Convert.ToUInt32(primRow["ObjectFlags"]);	1020	prim.Flags = (PrimFlags)Convert.ToUInt32(primRow["ObjectFlags"]);
1021	prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);	1021	prim.CreatorID = new UUID((Guid)primRow["CreatorID"]);
1022	prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);	1022	prim.OwnerID = new UUID((Guid)primRow["OwnerID"]);
1023	prim.GroupID = new UUID((Guid)primRow["GroupID"]);	1023	prim.GroupID = new UUID((Guid)primRow["GroupID"]);
@@ -1408,7 +1408,7 @@ VALUES
1408	parameters.Add(_Database.CreateParameter("SitName", prim.SitName));	1408	parameters.Add(_Database.CreateParameter("SitName", prim.SitName));
1409	parameters.Add(_Database.CreateParameter("TouchName", prim.TouchName));	1409	parameters.Add(_Database.CreateParameter("TouchName", prim.TouchName));
1410	// permissions	1410	// permissions
1411	parameters.Add(_Database.CreateParameter("ObjectFlags", prim.ObjectFlags));	1411	parameters.Add(_Database.CreateParameter("ObjectFlags", (uint)prim.Flags));
1412	parameters.Add(_Database.CreateParameter("CreatorID", prim.CreatorID));	1412	parameters.Add(_Database.CreateParameter("CreatorID", prim.CreatorID));
1413	parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));	1413	parameters.Add(_Database.CreateParameter("OwnerID", prim.OwnerID));
1414	parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));	1414	parameters.Add(_Database.CreateParameter("GroupID", prim.GroupID));