diff options
| author | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
| commit | 4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65 (patch) | |
| tree | 79142f2364b658f52b63e3ae688a5521290e2a4f /OpenSim/ApplicationPlugins/RemoteController | |
| parent | * more url / hg cleanup (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.zip opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.gz opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.bz2 opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
| -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 | } |