aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-23 13:14:29 -0700
committerJohn Hurliman2009-10-23 13:14:29 -0700
commita41cd1d0695c01e4096fa0b7696b415a4c7455fc (patch)
treea942c2f79906a7de36e3fe363fba2f8130e9f8c3 /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a41cd1d0695c01e4096fa0b7696b415a4c7455fc.zip
opensim-SC_OLD-a41cd1d0695c01e4096fa0b7696b415a4c7455fc.tar.gz
opensim-SC_OLD-a41cd1d0695c01e4096fa0b7696b415a4c7455fc.tar.bz2
opensim-SC_OLD-a41cd1d0695c01e4096fa0b7696b415a4c7455fc.tar.xz
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler * Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index ee848bb..a3bc04b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1223,10 +1223,7 @@ namespace OpenSim.Region.Framework.Scenes
1223 if (!m_backingup) 1223 if (!m_backingup)
1224 { 1224 {
1225 m_backingup = true; 1225 m_backingup = true;
1226 1226 Util.FireAndForget(BackupWaitCallback);
1227 System.ComponentModel.BackgroundWorker backupWorker = new System.ComponentModel.BackgroundWorker();
1228 backupWorker.DoWork += delegate(object sender, System.ComponentModel.DoWorkEventArgs e) { Backup(); };
1229 backupWorker.RunWorkerAsync();
1230 } 1227 }
1231 } 1228 }
1232 1229
@@ -1239,6 +1236,14 @@ namespace OpenSim.Region.Framework.Scenes
1239 } 1236 }
1240 1237
1241 /// <summary> 1238 /// <summary>
1239 /// Wrapper for Backup() that can be called with Util.FireAndForget()
1240 /// </summary>
1241 private void BackupWaitCallback(object o)
1242 {
1243 Backup();
1244 }
1245
1246 /// <summary>
1242 /// Backup the scene. This acts as the main method of the backup thread. 1247 /// Backup the scene. This acts as the main method of the backup thread.
1243 /// </summary> 1248 /// </summary>
1244 /// <returns></returns> 1249 /// <returns></returns>