diff options
| author | Melanie | 2009-11-28 09:26:00 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-28 09:26:00 +0000 |
| commit | d3e7a5293310651ea8adf28327e1cb9840bcf9d7 (patch) | |
| tree | 044fde70d244eecd8c1344eb973aa8d6e86e249b /OpenSim/Data | |
| parent | Reset update flag when a SOG is deleted. This fixes llDie(); (diff) | |
| parent | Add some conditionals to references to the WorldComm module, so that the (diff) | |
| download | opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.zip opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.gz opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.bz2 opensim-SC_OLD-d3e7a5293310651ea8adf28327e1cb9840bcf9d7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/Tests/BasicEstateTest.cs | 7 |
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 | |||
| 154 | ); | 154 | ); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | //[Test] | 157 | [Test] |
| 158 | // Currently fails occasionally | ||
| 159 | public void T012_EstateSettingsRandomStorage() | 158 | public void T012_EstateSettingsRandomStorage() |
| 160 | { | 159 | { |
| 161 | // Letting estate store generate rows to database for us | 160 | // Letting estate store generate rows to database for us |
| 162 | EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID); | 161 | EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID); |
| 163 | new PropertyScrambler<EstateSettings>().Scramble(originalSettings); | 162 | new PropertyScrambler<EstateSettings>() |
| 163 | .DontScramble(x=>x.EstateID) | ||
| 164 | .Scramble(originalSettings); | ||
| 164 | 165 | ||
| 165 | // Saving settings. | 166 | // Saving settings. |
| 166 | db.StoreEstateSettings(originalSettings); | 167 | db.StoreEstateSettings(originalSettings); |