aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs4
-rw-r--r--OpenSim/Data/SQLiteLegacy/SQLiteRegionData.cs4
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs8
4 files changed, 10 insertions, 10 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
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));
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());
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();
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index eeffdda..3cd9e0b 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -317,7 +317,7 @@ namespace OpenSim.Data.Tests
317 sop.CreatorID = creator; 317 sop.CreatorID = creator;
318 sop.InventorySerial = iserial; 318 sop.InventorySerial = iserial;
319 sop.TaskInventory = dic; 319 sop.TaskInventory = dic;
320 sop.ObjectFlags = objf; 320 sop.Flags = (PrimFlags)objf;
321 sop.Name = name; 321 sop.Name = name;
322 sop.Material = material; 322 sop.Material = material;
323 sop.ScriptAccessPin = pin; 323 sop.ScriptAccessPin = pin;
@@ -350,7 +350,7 @@ namespace OpenSim.Data.Tests
350 // Modified in-class 350 // Modified in-class
351 // Assert.That(iserial,Is.EqualTo(sop.InventorySerial), "Assert.That(iserial,Is.EqualTo(sop.InventorySerial))"); 351 // Assert.That(iserial,Is.EqualTo(sop.InventorySerial), "Assert.That(iserial,Is.EqualTo(sop.InventorySerial))");
352 Assert.That(dic,Is.EqualTo(sop.TaskInventory), "Assert.That(dic,Is.EqualTo(sop.TaskInventory))"); 352 Assert.That(dic,Is.EqualTo(sop.TaskInventory), "Assert.That(dic,Is.EqualTo(sop.TaskInventory))");
353 Assert.That(objf,Is.EqualTo(sop.ObjectFlags), "Assert.That(objf,Is.EqualTo(sop.ObjectFlags))"); 353 Assert.That(objf, Is.EqualTo((uint)sop.Flags), "Assert.That(objf,Is.EqualTo(sop.Flags))");
354 Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))"); 354 Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))");
355 Assert.That(material,Is.EqualTo(sop.Material), "Assert.That(material,Is.EqualTo(sop.Material))"); 355 Assert.That(material,Is.EqualTo(sop.Material), "Assert.That(material,Is.EqualTo(sop.Material))");
356 Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin))"); 356 Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin))");
@@ -373,7 +373,7 @@ namespace OpenSim.Data.Tests
373 Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))"); 373 Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
374 374
375 // This is necessary or object will not be inserted in DB 375 // This is necessary or object will not be inserted in DB
376 sop.ObjectFlags = 0; 376 sop.Flags = PrimFlags.None;
377 377
378 SceneObjectGroup sog = new SceneObjectGroup(sop); 378 SceneObjectGroup sog = new SceneObjectGroup(sop);
379 379
@@ -398,7 +398,7 @@ namespace OpenSim.Data.Tests
398 Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))"); 398 Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
399 //Assert.That(iserial,Is.EqualTo(p.InventorySerial), "Assert.That(iserial,Is.EqualTo(p.InventorySerial))"); 399 //Assert.That(iserial,Is.EqualTo(p.InventorySerial), "Assert.That(iserial,Is.EqualTo(p.InventorySerial))");
400 Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))"); 400 Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))");
401 //Assert.That(objf,Is.EqualTo(p.ObjectFlags), "Assert.That(objf,Is.EqualTo(p.ObjectFlags))"); 401 //Assert.That(objf, Is.EqualTo((uint)p.Flags), "Assert.That(objf,Is.EqualTo(p.Flags))");
402 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))"); 402 Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
403 Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))"); 403 Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))");
404 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))"); 404 Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))");