diff options
author | Oren Hurvitz | 2012-07-24 19:48:08 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-14 20:25:03 +0100 |
commit | ce468215d576cc301a261d85bee9baa68a246ce6 (patch) | |
tree | ad2c6d7e3156bf8dab596f2772cc712d4f96c698 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present... (diff) | |
download | opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.zip opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.gz opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.bz2 opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.xz |
Support multi-region OAR files
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 2f34785..e1c9c8e 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -531,7 +531,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
531 | /// the scripts may not have started yet | 531 | /// the scripts may not have started yet |
532 | /// Message is non empty string if there were problems loading the oar file | 532 | /// Message is non empty string if there were problems loading the oar file |
533 | /// </summary> | 533 | /// </summary> |
534 | public delegate void OarFileLoaded(Guid guid, string message); | 534 | public delegate void OarFileLoaded(Guid guid, List<UUID> loadedScenes, string message); |
535 | public event OarFileLoaded OnOarFileLoaded; | 535 | public event OarFileLoaded OnOarFileLoaded; |
536 | 536 | ||
537 | /// <summary> | 537 | /// <summary> |
@@ -2195,7 +2195,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2195 | return 6; | 2195 | return 6; |
2196 | } | 2196 | } |
2197 | 2197 | ||
2198 | public void TriggerOarFileLoaded(Guid requestId, string message) | 2198 | public void TriggerOarFileLoaded(Guid requestId, List<UUID> loadedScenes, string message) |
2199 | { | 2199 | { |
2200 | OarFileLoaded handlerOarFileLoaded = OnOarFileLoaded; | 2200 | OarFileLoaded handlerOarFileLoaded = OnOarFileLoaded; |
2201 | if (handlerOarFileLoaded != null) | 2201 | if (handlerOarFileLoaded != null) |
@@ -2204,7 +2204,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2204 | { | 2204 | { |
2205 | try | 2205 | try |
2206 | { | 2206 | { |
2207 | d(requestId, message); | 2207 | d(requestId, loadedScenes, message); |
2208 | } | 2208 | } |
2209 | catch (Exception e) | 2209 | catch (Exception e) |
2210 | { | 2210 | { |