Merge branch 'master' of ssh://MyConnection/var/git/opensim

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index d8e1725..907bb38 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -154,13 +154,14 @@ namespace OpenSim.Data.Tests
                 );
         }
 
-        //[Test]
-        // Currently fails occasionally
+        [Test]
         public void T012_EstateSettingsRandomStorage()
         {
             // Letting estate store generate rows to database for us
             EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
-            new PropertyScrambler<EstateSettings>().Scramble(originalSettings);
+            new PropertyScrambler<EstateSettings>()
+                .DontScramble(x=>x.EstateID)
+                .Scramble(originalSettings);
 
             // Saving settings.
             db.StoreEstateSettings(originalSettings);