diff options
author | Melanie | 2012-11-13 02:10:09 +0000 |
---|---|---|
committer | Melanie | 2012-11-13 02:10:09 +0000 |
commit | 9a5679876ed158f9944f209cbb68f370fabe8d12 (patch) | |
tree | d5f282b13c448abec9f7329e88647cec459ede5f /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.zip opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.gz opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.bz2 opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 50c51d3..f4f9e2d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
46 | /// <summary> | 46 | /// <summary> |
47 | /// This module loads and saves OpenSimulator inventory archives | 47 | /// This module loads and saves OpenSimulator inventory archives |
48 | /// </summary> | 48 | /// </summary> |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "InventoryArchiverModule")] |
50 | public class InventoryArchiverModule : ISharedRegionModule, IInventoryArchiverModule | 50 | public class InventoryArchiverModule : ISharedRegionModule, IInventoryArchiverModule |
51 | { | 51 | { |
52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |