diff options
| author | Melanie | 2010-10-16 10:52:56 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-16 10:52:56 +0100 |
| commit | 46e5c8e919076835fb0f7118b6a0e0269c01b671 (patch) | |
| tree | e222bf427a984b377ae405e6cbc9ff42e8aa7a39 /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Drop max oar loading version back to 0 from 1 (diff) | |
| download | opensim-SC_OLD-46e5c8e919076835fb0f7118b6a0e0269c01b671.zip opensim-SC_OLD-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.gz opensim-SC_OLD-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.bz2 opensim-SC_OLD-46e5c8e919076835fb0f7118b6a0e0269c01b671.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -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 a47fc01..76c9046 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
| @@ -2402,7 +2402,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
| 2402 | if (archiver != null) | 2402 | if (archiver != null) |
| 2403 | { | 2403 | { |
| 2404 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; | 2404 | scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; |
| 2405 | archiver.ArchiveRegion(filename); | 2405 | archiver.ArchiveRegion(filename, new Dictionary<string, object>()); |
| 2406 | lock (m_saveOarLock) Monitor.Wait(m_saveOarLock,5000); | 2406 | lock (m_saveOarLock) Monitor.Wait(m_saveOarLock,5000); |
| 2407 | scene.EventManager.OnOarFileSaved -= RemoteAdminOarSaveCompleted; | 2407 | scene.EventManager.OnOarFileSaved -= RemoteAdminOarSaveCompleted; |
| 2408 | } | 2408 | } |