From 607ed61ec2f7b5c3428522ab1b50de640b510dfd Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 28 Mar 2010 23:18:25 +0100
Subject: Stab one bug. When joining an estate with a new region, make sure
 it's also used on first run and not only later.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
 1 file changed, 2 insertions(+)

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
 
                             int estateID = estateIDs[0];
 
+                            m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(estateID);
+
                             if (m_storageManager.EstateDataStore.LinkRegion(m_regInfo.RegionID, estateID))
                                 break;
 
-- 
cgit v1.1