aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorDan Lake2012-05-10 14:43:02 -0700
committerDan Lake2012-05-10 14:43:02 -0700
commit117c183fde5c21bd87c99cb0af4c1903550570e9 (patch)
treed109468b072ec15d8a6afee384185aab3439b056 /OpenSim/ApplicationPlugins
parentAdd even for terrain tainting and synchronize terrain module with physics sce... (diff)
parentSaving estate state is really slow (relatively) and it gets (diff)
downloadopensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.zip
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2
opensim-SC_OLD-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 45b8d6f..0065702 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -122,9 +122,10 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
122 Thread.CurrentThread.ManagedThreadId.ToString() + 122 Thread.CurrentThread.ManagedThreadId.ToString() +
123 ")"); 123 ")");
124 124
125 m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]); 125 bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
126 m_openSim.CreateRegion(regionsToLoad[i], true, out scene); 126 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
127 regionsToLoad[i].EstateSettings.Save(); 127 if (changed)
128 regionsToLoad[i].EstateSettings.Save();
128 129
129 if (scene != null) 130 if (scene != null)
130 { 131 {