diff options
| author | Diva Canto | 2010-10-15 17:27:19 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-10-15 17:27:19 -0700 |
| commit | 1499607215aab4994f933a8ed2a54ed037a1f9ba (patch) | |
| tree | e343f5115c50c8dbae730a15c41a0d62f5b9f74d /OpenSim/ApplicationPlugins/RemoteController | |
| parent | UPdated the MySql driver to 6.2.4. Also established a much larger MySqlComman... (diff) | |
| download | opensim-SC_OLD-1499607215aab4994f933a8ed2a54ed037a1f9ba.zip opensim-SC_OLD-1499607215aab4994f933a8ed2a54ed037a1f9ba.tar.gz opensim-SC_OLD-1499607215aab4994f933a8ed2a54ed037a1f9ba.tar.bz2 opensim-SC_OLD-1499607215aab4994f933a8ed2a54ed037a1f9ba.tar.xz | |
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
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 | } |