diff options
author | Melanie | 2011-11-02 23:51:48 +0000 |
---|---|---|
committer | Melanie | 2011-11-02 23:51:48 +0000 |
commit | e746840226ca56a87d597c899f7c0bd8cf2980b2 (patch) | |
tree | 3eb405e222426a8d51dd9274275673ef34780a48 /OpenSim/Data/Tests/RegionTests.cs | |
parent | Port the Avination offline messaging system to Core (diff) | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.zip opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.gz opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.bz2 opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index cac8cac..1b93176 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
@@ -297,7 +297,6 @@ namespace OpenSim.Data.Tests | |||
297 | pbshap.ProfileEnd = ushort.MaxValue; | 297 | pbshap.ProfileEnd = ushort.MaxValue; |
298 | pbshap.ProfileHollow = ushort.MaxValue; | 298 | pbshap.ProfileHollow = ushort.MaxValue; |
299 | Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next()); | 299 | Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next()); |
300 | byte updatef = (byte) random.Next(127); | ||
301 | 300 | ||
302 | RegionInfo regionInfo = new RegionInfo(); | 301 | RegionInfo regionInfo = new RegionInfo(); |
303 | regionInfo.RegionID = region3; | 302 | regionInfo.RegionID = region3; |
@@ -336,7 +335,6 @@ namespace OpenSim.Data.Tests | |||
336 | sop.LinkNum = linknum; | 335 | sop.LinkNum = linknum; |
337 | sop.ClickAction = clickaction; | 336 | sop.ClickAction = clickaction; |
338 | sop.Scale = scale; | 337 | sop.Scale = scale; |
339 | sop.UpdateFlag = updatef; | ||
340 | 338 | ||
341 | //Tests if local part accepted the parameters: | 339 | //Tests if local part accepted the parameters: |
342 | Assert.That(regionh,Is.EqualTo(sop.RegionHandle), "Assert.That(regionh,Is.EqualTo(sop.RegionHandle))"); | 340 | Assert.That(regionh,Is.EqualTo(sop.RegionHandle), "Assert.That(regionh,Is.EqualTo(sop.RegionHandle))"); |
@@ -369,7 +367,6 @@ namespace OpenSim.Data.Tests | |||
369 | Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))"); | 367 | Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))"); |
370 | Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))"); | 368 | Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))"); |
371 | Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))"); | 369 | Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))"); |
372 | Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))"); | ||
373 | 370 | ||
374 | // This is necessary or object will not be inserted in DB | 371 | // This is necessary or object will not be inserted in DB |
375 | sop.Flags = PrimFlags.None; | 372 | sop.Flags = PrimFlags.None; |
@@ -469,7 +466,6 @@ namespace OpenSim.Data.Tests | |||
469 | PrimitiveBaseShape pbshap = new PrimitiveBaseShape(); | 466 | PrimitiveBaseShape pbshap = new PrimitiveBaseShape(); |
470 | pbshap = PrimitiveBaseShape.Default; | 467 | pbshap = PrimitiveBaseShape.Default; |
471 | Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next()); | 468 | Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next()); |
472 | byte updatef = (byte) random.Next(127); | ||
473 | 469 | ||
474 | // Updates the region with new values | 470 | // Updates the region with new values |
475 | SceneObjectGroup sog2 = FindSOG("Adam West", region3); | 471 | SceneObjectGroup sog2 = FindSOG("Adam West", region3); |
@@ -499,7 +495,6 @@ namespace OpenSim.Data.Tests | |||
499 | sog2.RootPart.LinkNum = linknum; | 495 | sog2.RootPart.LinkNum = linknum; |
500 | sog2.RootPart.ClickAction = clickaction; | 496 | sog2.RootPart.ClickAction = clickaction; |
501 | sog2.RootPart.Scale = scale; | 497 | sog2.RootPart.Scale = scale; |
502 | sog2.RootPart.UpdateFlag = updatef; | ||
503 | 498 | ||
504 | db.StoreObject(sog2, region3); | 499 | db.StoreObject(sog2, region3); |
505 | List<SceneObjectGroup> sogs = db.LoadObjects(region3); | 500 | List<SceneObjectGroup> sogs = db.LoadObjects(region3); |