diff options
| author | meta7 | 2010-08-18 02:53:27 -0700 |
|---|---|---|
| committer | meta7 | 2010-08-18 02:53:27 -0700 |
| commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
| tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |
| parent | Fix a nullref exception in the prioritizer (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC_OLD-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index d8debc5..1edcb5d 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
| @@ -1081,7 +1081,7 @@ namespace OpenSim.Data.MySQL | |||
| 1081 | prim.SitName = (string)row["SitName"]; | 1081 | prim.SitName = (string)row["SitName"]; |
| 1082 | prim.TouchName = (string)row["TouchName"]; | 1082 | prim.TouchName = (string)row["TouchName"]; |
| 1083 | // Permissions | 1083 | // Permissions |
| 1084 | prim.ObjectFlags = (uint)(int)row["ObjectFlags"]; | 1084 | prim.Flags = (PrimFlags)(int)row["ObjectFlags"]; |
| 1085 | prim.OwnerMask = (uint)(int)row["OwnerMask"]; | 1085 | prim.OwnerMask = (uint)(int)row["OwnerMask"]; |
| 1086 | prim.NextOwnerMask = (uint)(int)row["NextOwnerMask"]; | 1086 | prim.NextOwnerMask = (uint)(int)row["NextOwnerMask"]; |
| 1087 | prim.GroupMask = (uint)(int)row["GroupMask"]; | 1087 | prim.GroupMask = (uint)(int)row["GroupMask"]; |
| @@ -1414,7 +1414,7 @@ namespace OpenSim.Data.MySQL | |||
| 1414 | cmd.Parameters.AddWithValue("SitName", prim.SitName); | 1414 | cmd.Parameters.AddWithValue("SitName", prim.SitName); |
| 1415 | cmd.Parameters.AddWithValue("TouchName", prim.TouchName); | 1415 | cmd.Parameters.AddWithValue("TouchName", prim.TouchName); |
| 1416 | // permissions | 1416 | // permissions |
| 1417 | cmd.Parameters.AddWithValue("ObjectFlags", prim.ObjectFlags); | 1417 | cmd.Parameters.AddWithValue("ObjectFlags", (uint)prim.Flags); |
| 1418 | cmd.Parameters.AddWithValue("CreatorID", prim.CreatorID.ToString()); | 1418 | cmd.Parameters.AddWithValue("CreatorID", prim.CreatorID.ToString()); |
| 1419 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); | 1419 | cmd.Parameters.AddWithValue("OwnerID", prim.OwnerID.ToString()); |
| 1420 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); | 1420 | cmd.Parameters.AddWithValue("GroupID", prim.GroupID.ToString()); |