OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix small bug with remove region; update settings docs. 

Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map.
bulletsim
Sean McNamara 2011-02-28 11:54:07 -05:00
parent 018645f9f8
commit b3c42e952f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs
View File

@ -71,6 +71,10 @@ using OpenSim.Region.Framework.Scenes;
* "Overwrite": Always save to file named "${AutoBackupDir}/RegionName.oar", even if we have to overwrite an existing file. * "Overwrite": Always save to file named "${AutoBackupDir}/RegionName.oar", even if we have to overwrite an existing file.
* AutoBackupDir: String. Default: "." (the current directory). * AutoBackupDir: String. Default: "." (the current directory).
* A directory (absolute or relative) where backups should be saved. * A directory (absolute or relative) where backups should be saved.
* AutoBackupDilationThreshold: float. Default: 0.5. Lower bound on time dilation required for BusyCheck heuristics to pass.
* If the time dilation is below this value, don't take a backup right now.
* AutoBackupAgentThreshold: int. Default: 10. Upper bound on # of agents in region required for BusyCheck heuristics to pass.
* If the number of agents is greater than this value, don't take a backup right now.
* */ * */
namespace OpenSim.Region.OptionalModules.World.AutoBackup namespace OpenSim.Region.OptionalModules.World.AutoBackup
@ -91,7 +95,6 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
//AutoBackupModuleState: Auto-Backup state for one region (scene). //AutoBackupModuleState: Auto-Backup state for one region (scene).
public class AutoBackupModuleState public class AutoBackupModuleState
{ {
private readonly IScene m_scene;
private bool m_enabled = false; private bool m_enabled = false;
private NamingType m_naming = NamingType.TIME; private NamingType m_naming = NamingType.TIME;
private Timer m_timer = null; private Timer m_timer = null;
@ -99,11 +102,9 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
private string m_script = null; private string m_script = null;
private string m_dir = "."; private string m_dir = ".";
public AutoBackupModuleState (IScene scene) public AutoBackupModuleState ()
{ {
m_scene = scene;
if (scene == null)
throw new NullReferenceException ("Required parameter missing for AutoBackupModuleState constructor");
} }
public void SetEnabled (bool b) public void SetEnabled (bool b)
@ -226,6 +227,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
timers.Remove (timer.Interval); timers.Remove (timer.Interval);
timer.Close (); timer.Close ();
} }
states.Remove(scene);
} }
void IRegionModuleBase.RegionLoaded (Framework.Scenes.Scene scene) void IRegionModuleBase.RegionLoaded (Framework.Scenes.Scene scene)
@ -238,7 +240,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
return; return;
string sRegionName = scene.RegionInfo.RegionName; string sRegionName = scene.RegionInfo.RegionName;
AutoBackupModuleState st = new AutoBackupModuleState (scene); AutoBackupModuleState st = new AutoBackupModuleState ();
states.Add (scene, st); states.Add (scene, st);
//Read the config settings and set variables. //Read the config settings and set variables.