diff options
| author | Melanie | 2010-03-28 23:18:25 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-28 23:18:25 +0100 |
| commit | 607ed61ec2f7b5c3428522ab1b50de640b510dfd (patch) | |
| tree | dcf5c44c443a8f2c99292fddc2a5b2f05706f13e /OpenSim | |
| parent | May fix mantis #4613 (diff) | |
| download | opensim-SC_OLD-607ed61ec2f7b5c3428522ab1b50de640b510dfd.zip opensim-SC_OLD-607ed61ec2f7b5c3428522ab1b50de640b510dfd.tar.gz opensim-SC_OLD-607ed61ec2f7b5c3428522ab1b50de640b510dfd.tar.bz2 opensim-SC_OLD-607ed61ec2f7b5c3428522ab1b50de640b510dfd.tar.xz | |
Stab one bug. When joining an estate with a new region, make sure it's also
used on first run and not only later.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8a583c1..0085df3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -635,6 +635,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 635 | 635 | ||
| 636 | int estateID = estateIDs[0]; | 636 | int estateID = estateIDs[0]; |
| 637 | 637 | ||
| 638 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(estateID); | ||
| 639 | |||
| 638 | if (m_storageManager.EstateDataStore.LinkRegion(m_regInfo.RegionID, estateID)) | 640 | if (m_storageManager.EstateDataStore.LinkRegion(m_regInfo.RegionID, estateID)) |
| 639 | break; | 641 | break; |
| 640 | 642 | ||