diff options
| author | Sean McNamara | 2011-04-11 13:20:46 -0400 |
|---|---|---|
| committer | Sean McNamara | 2011-04-11 13:20:46 -0400 |
| commit | 95a6ee0a3793b72deb29fe6e853d59afc2ca631e (patch) | |
| tree | f1cff974e09ab7c87b2042300fd32054a953810c /OpenSim/Region | |
| parent | Fix some NREs on certain paths. (diff) | |
| download | opensim-SC_OLD-95a6ee0a3793b72deb29fe6e853d59afc2ca631e.zip opensim-SC_OLD-95a6ee0a3793b72deb29fe6e853d59afc2ca631e.tar.gz opensim-SC_OLD-95a6ee0a3793b72deb29fe6e853d59afc2ca631e.tar.bz2 opensim-SC_OLD-95a6ee0a3793b72deb29fe6e853d59afc2ca631e.tar.xz | |
Fix NREs harder.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs index 3d156ca..e52e9cb 100644 --- a/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs +++ b/OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs | |||
| @@ -225,6 +225,10 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup | |||
| 225 | if (m_Enabled) { | 225 | if (m_Enabled) { |
| 226 | m_log.Info ("[AUTO BACKUP]: AutoBackupModule enabled"); | 226 | m_log.Info ("[AUTO BACKUP]: AutoBackupModule enabled"); |
| 227 | } | 227 | } |
| 228 | else { | ||
| 229 | m_log.Info ("[AUTO BACKUP]: AutoBackupModule disabled"); | ||
| 230 | return; | ||
| 231 | } | ||
| 228 | } | 232 | } |
| 229 | 233 | ||
| 230 | Timer defTimer = new Timer(720 * 60000); | 234 | Timer defTimer = new Timer(720 * 60000); |
| @@ -360,24 +364,27 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup | |||
| 360 | } | 364 | } |
| 361 | 365 | ||
| 362 | //Add the current region to the list of regions tied to this timer. | 366 | //Add the current region to the list of regions tied to this timer. |
| 363 | if(state != null) | 367 | if(scene != null) |
| 364 | { | 368 | { |
| 365 | if (timerMap.ContainsKey (state.GetTimer ())) { | 369 | if(state != null) |
| 366 | timerMap[state.GetTimer ()].Add (scene); | 370 | { |
| 367 | } else { | 371 | if (timerMap.ContainsKey (state.GetTimer ())) { |
| 368 | List<IScene> scns = new List<IScene> (1); | 372 | timerMap[state.GetTimer ()].Add (scene); |
| 369 | scns.Add (scene); | 373 | } else { |
| 370 | timerMap.Add (state.GetTimer (), scns); | 374 | List<IScene> scns = new List<IScene> (1); |
| 375 | scns.Add (scene); | ||
| 376 | timerMap.Add (state.GetTimer (), scns); | ||
| 377 | } | ||
| 371 | } | 378 | } |
| 372 | } | 379 | else |
| 373 | else | 380 | { |
| 374 | { | 381 | if(timerMap.ContainsKey(defaultState.GetTimer())) { |
| 375 | if(timerMap.ContainsKey(defaultState.GetTimer())) { | 382 | timerMap[defaultState.GetTimer()].Add(scene); |
| 376 | timerMap[defaultState.GetTimer()].Add(scene); | 383 | } else { |
| 377 | } else { | 384 | List<IScene> scns = new List<IScene> (1); |
| 378 | List<IScene> scns = new List<IScene> (1); | 385 | scns.Add(scene); |
| 379 | scns.Add(scene); | 386 | timerMap.Add(defaultState.GetTimer(), scns); |
| 380 | timerMap.Add(defaultState.GetTimer(), scns); | 387 | } |
| 381 | } | 388 | } |
| 382 | } | 389 | } |
| 383 | 390 | ||