diff options
Diffstat (limited to 'OpenSim/Data/Tests')
-rw-r--r-- | OpenSim/Data/Tests/EstateTests.cs | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs index 7f13925..39ecb89 100644 --- a/OpenSim/Data/Tests/EstateTests.cs +++ b/OpenSim/Data/Tests/EstateTests.cs | |||
@@ -335,8 +335,7 @@ namespace OpenSim.Data.Tests | |||
335 | // Letting estate store generate rows to database for us | 335 | // Letting estate store generate rows to database for us |
336 | EstateSettings originalSettings = db.LoadEstateSettings(regionId, true); | 336 | EstateSettings originalSettings = db.LoadEstateSettings(regionId, true); |
337 | 337 | ||
338 | SetEstateSettings( | 338 | SetEstateSettings(originalSettings, |
339 | originalSettings, | ||
340 | estateName, | 339 | estateName, |
341 | parentEstateID, | 340 | parentEstateID, |
342 | billableFactor, | 341 | billableFactor, |
@@ -362,30 +361,6 @@ namespace OpenSim.Data.Tests | |||
362 | estateOwner | 361 | estateOwner |
363 | ); | 362 | ); |
364 | 363 | ||
365 | originalSettings.EstateName = estateName; | ||
366 | originalSettings.ParentEstateID = parentEstateID; | ||
367 | originalSettings.BillableFactor = billableFactor; | ||
368 | originalSettings.PricePerMeter = pricePerMeter; | ||
369 | originalSettings.RedirectGridX = redirectGridX; | ||
370 | originalSettings.RedirectGridY = redirectGridY; | ||
371 | originalSettings.UseGlobalTime = useGlobalTime; | ||
372 | originalSettings.FixedSun = fixedSun; | ||
373 | originalSettings.SunPosition = sunPosition; | ||
374 | originalSettings.AllowVoice = allowVoice; | ||
375 | originalSettings.AllowDirectTeleport = allowDirectTeleport; | ||
376 | originalSettings.ResetHomeOnTeleport = resetHomeOnTeleport; | ||
377 | originalSettings.DenyAnonymous = denyAnonymous; | ||
378 | originalSettings.DenyIdentified = denyIdentified; | ||
379 | originalSettings.DenyTransacted = denyTransacted; | ||
380 | originalSettings.DenyMinors = denyMinors; | ||
381 | originalSettings.AbuseEmailToEstateOwner = abuseEmailToEstateOwner; | ||
382 | originalSettings.BlockDwell = blockDwell; | ||
383 | originalSettings.EstateSkipScripts = estateSkipScripts; | ||
384 | originalSettings.TaxFree = taxFree; | ||
385 | originalSettings.PublicAccess = publicAccess; | ||
386 | originalSettings.AbuseEmail = abuseEmail; | ||
387 | originalSettings.EstateOwner = estateOwner; | ||
388 | |||
389 | // Saving settings. | 364 | // Saving settings. |
390 | db.StoreEstateSettings(originalSettings); | 365 | db.StoreEstateSettings(originalSettings); |
391 | 366 | ||
@@ -393,8 +368,7 @@ namespace OpenSim.Data.Tests | |||
393 | EstateSettings loadedSettings = db.LoadEstateSettings(regionId, true); | 368 | EstateSettings loadedSettings = db.LoadEstateSettings(regionId, true); |
394 | 369 | ||
395 | // Checking that loaded values are correct. | 370 | // Checking that loaded values are correct. |
396 | ValidateEstateSettings( | 371 | ValidateEstateSettings(loadedSettings, |
397 | loadedSettings, | ||
398 | estateName, | 372 | estateName, |
399 | parentEstateID, | 373 | parentEstateID, |
400 | billableFactor, | 374 | billableFactor, |