diff options
| author | opensim mirror account | 2010-10-15 17:30:05 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-15 17:30:05 -0700 |
| commit | 06b17841e2e8b3677153e3209667ed92fb731260 (patch) | |
| tree | e343f5115c50c8dbae730a15c41a0d62f5b9f74d /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Made OARs use the new serialization procedure. (TPs/crossings still on the ol... (diff) | |
| download | opensim-SC_OLD-06b17841e2e8b3677153e3209667ed92fb731260.zip opensim-SC_OLD-06b17841e2e8b3677153e3209667ed92fb731260.tar.gz opensim-SC_OLD-06b17841e2e8b3677153e3209667ed92fb731260.tar.bz2 opensim-SC_OLD-06b17841e2e8b3677153e3209667ed92fb731260.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
| -rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index bb0a5b5..aeed467 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -2284,7 +2284,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2284 | if (archiver != null) | 2284 | if (archiver != null) |
| 2285 | { | 2285 | { |
| 2286 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; | 2286 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; |
| 2287 | archiver.ArchiveRegion(filename); | 2287 | archiver.ArchiveRegion(filename, new Dictionary<string, object>()); |
| 2288 | lock (m_saveOarLock) Monitor.Wait(m_saveOarLock,5000); | 2288 | lock (m_saveOarLock) Monitor.Wait(m_saveOarLock,5000); |
| 2289 | scene.EventManager.OnOarFileSaved -= RemoteAdminOarSaveCompleted; | 2289 | scene.EventManager.OnOarFileSaved -= RemoteAdminOarSaveCompleted; |
| 2290 | } | 2290 | } |