diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:21:06 +0000 |
commit | a87a247f0548d39a8c39b1d28123d7da8db44598 (patch) | |
tree | 7f9f77c38a224bc6d4bea7ccced1d4710c8a91b1 /OpenSim/Region/CoreModules/Agent/AssetTransaction | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.zip opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.gz opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.bz2 opensim-SC_OLD-a87a247f0548d39a8c39b1d28123d7da8db44598.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent/AssetTransaction')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index 7012037..1077f4a 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using Mono.Addins; | ||
31 | using Nini.Config; | 30 | using Nini.Config; |
32 | using OpenMetaverse; | 31 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -36,8 +35,7 @@ using OpenSim.Region.Framework.Scenes; | |||
36 | 35 | ||
37 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | 36 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction |
38 | { | 37 | { |
39 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 38 | public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions |
40 | public class AssetTransactionModule : ISharedRegionModule, IAgentAssetTransactions | ||
41 | { | 39 | { |
42 | private readonly Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>(); | 40 | private readonly Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>(); |
43 | private bool m_dumpAssetsToFile = false; | 41 | private bool m_dumpAssetsToFile = false; |
@@ -61,14 +59,9 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
61 | //m_log.Debug("creating AgentAssetTransactionModule"); | 59 | //m_log.Debug("creating AgentAssetTransactionModule"); |
62 | } | 60 | } |
63 | 61 | ||
64 | #region ISharedRegionModule Members | 62 | #region IRegionModule Members |
65 | 63 | ||
66 | public void Initialise(IConfigSource config) | 64 | public void Initialise(Scene scene, IConfigSource config) |
67 | { | ||
68 | |||
69 | } | ||
70 | |||
71 | public void AddRegion(Scene scene) | ||
72 | { | 65 | { |
73 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) | 66 | if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) |
74 | { | 67 | { |
@@ -86,23 +79,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
86 | m_scene = scene; | 79 | m_scene = scene; |
87 | } | 80 | } |
88 | 81 | ||
89 | public Type ReplaceableInterface | ||
90 | { | ||
91 | get { return null; } | ||
92 | } | ||
93 | |||
94 | public void RegionLoaded(Scene scene) | ||
95 | { | ||
96 | } | ||
97 | |||
98 | public void RemoveRegion(Scene scene) | ||
99 | { | ||
100 | if (RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID)) | ||
101 | RegisteredScenes.Remove(scene.RegionInfo.RegionID); | ||
102 | scene.UnregisterModuleInterface<IAgentAssetTransactions>(this); | ||
103 | scene.EventManager.OnNewClient -= NewClient; | ||
104 | } | ||
105 | |||
106 | public void PostInitialise() | 82 | public void PostInitialise() |
107 | { | 83 | { |
108 | } | 84 | } |
@@ -116,6 +92,11 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction | |||
116 | get { return "AgentTransactionModule"; } | 92 | get { return "AgentTransactionModule"; } |
117 | } | 93 | } |
118 | 94 | ||
95 | public bool IsSharedModule | ||
96 | { | ||
97 | get { return true; } | ||
98 | } | ||
99 | |||
119 | #endregion | 100 | #endregion |
120 | 101 | ||
121 | public void NewClient(IClientAPI client) | 102 | public void NewClient(IClientAPI client) |