diff options
author | Justin Clark-Casey (justincc) | 2010-08-13 20:23:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-13 20:23:53 +0100 |
commit | 39a748b47a5eb8020f167287c84a91bee0881cca (patch) | |
tree | 2733d3111fd652549a6447b4c991c3f5e7664986 /OpenSim/Data/Tests/RegionTests.cs | |
parent | File wants to be committed (diff) | |
download | opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.zip opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.gz opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.bz2 opensim-SC_OLD-39a748b47a5eb8020f167287c84a91bee0881cca.tar.xz |
refactor: Use SOP.Flags rather than SOP.ObjectFlags
Diffstat (limited to 'OpenSim/Data/Tests/RegionTests.cs')
-rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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))"); |