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/OptionalModules/Scripting | |
| parent | Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present... (diff) | |
| download | opensim-SC-ce468215d576cc301a261d85bee9baa68a246ce6.zip opensim-SC-ce468215d576cc301a261d85bee9baa68a246ce6.tar.gz opensim-SC-ce468215d576cc301a261d85bee9baa68a246ce6.tar.bz2 opensim-SC-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 'OpenSim/Region/OptionalModules/Scripting')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index fff3a32..bad75f7 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs | |||
| @@ -181,7 +181,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady | |||
| 181 | } | 181 | } |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | void OnOarFileLoaded(Guid requestId, string message) | 184 | void OnOarFileLoaded(Guid requestId, List<UUID> loadedScenes, string message) |
| 185 | { | 185 | { |
| 186 | m_oarFileLoading = true; | 186 | m_oarFileLoading = true; |
| 187 | 187 | ||