diff options
author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/World/Archiver | |
parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index abf3713..1be6386 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -32,6 +32,7 @@ using System.Reflection; | |||
32 | using log4net; | 32 | using log4net; |
33 | using NDesk.Options; | 33 | using NDesk.Options; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using Mono.Addins; | ||
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
37 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
@@ -42,6 +43,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
42 | /// <summary> | 43 | /// <summary> |
43 | /// This module loads and saves OpenSimulator region archives | 44 | /// This module loads and saves OpenSimulator region archives |
44 | /// </summary> | 45 | /// </summary> |
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ArchiverModule")] | ||
45 | public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule | 47 | public class ArchiverModule : INonSharedRegionModule, IRegionArchiverModule |
46 | { | 48 | { |
47 | private static readonly ILog m_log = | 49 | private static readonly ILog m_log = |