diff options
author | Melanie | 2010-01-29 07:20:13 +0000 |
---|---|---|
committer | Melanie | 2010-01-29 07:20:13 +0000 |
commit | cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac (patch) | |
tree | 43f3fd01f30651d482f81b5ae7c25fd84cc8ca37 /OpenSim/Region/CoreModules/World/Vegetation | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.zip opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.gz opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.bz2 opensim-SC-cfca9e1e811f6cdea6b7c3338f7f783a07f8e0ac.tar.xz |
Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Vegetation')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs index 0b487ed..c2ad7b8 100644 --- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs | |||
@@ -28,7 +28,6 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Reflection; | 29 | using System.Reflection; |
30 | using log4net; | 30 | using log4net; |
31 | using Mono.Addins; | ||
32 | using Nini.Config; | 31 | using Nini.Config; |
33 | using OpenMetaverse; | 32 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
@@ -37,8 +36,7 @@ using OpenSim.Region.Framework.Scenes; | |||
37 | 36 | ||
38 | namespace OpenSim.Region.CoreModules.Avatar.Vegetation | 37 | namespace OpenSim.Region.CoreModules.Avatar.Vegetation |
39 | { | 38 | { |
40 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 39 | public class VegetationModule : IRegionModule, IVegetationModule |
41 | public class VegetationModule : INonSharedRegionModule, IVegetationModule | ||
42 | { | 40 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 42 | ||
@@ -47,34 +45,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation | |||
47 | protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree }; | 45 | protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree }; |
48 | public PCode[] CreationCapabilities { get { return creationCapabilities; } } | 46 | public PCode[] CreationCapabilities { get { return creationCapabilities; } } |
49 | 47 | ||
50 | public void Initialise(IConfigSource source) | 48 | public void Initialise(Scene scene, IConfigSource source) |
51 | { | ||
52 | } | ||
53 | |||
54 | public void AddRegion(Scene scene) | ||
55 | { | 49 | { |
56 | m_scene = scene; | 50 | m_scene = scene; |
57 | m_scene.RegisterModuleInterface<IVegetationModule>(this); | 51 | m_scene.RegisterModuleInterface<IVegetationModule>(this); |
58 | } | 52 | } |
59 | |||
60 | public Type ReplaceableInterface | ||
61 | { | ||
62 | get { return null; } | ||
63 | } | ||
64 | |||
65 | public void RegionLoaded(Scene scene) | ||
66 | { | ||
67 | } | ||
68 | |||
69 | public void RemoveRegion(Scene scene) | ||
70 | { | ||
71 | scene.UnregisterModuleInterface<IVegetationModule>(this); | ||
72 | } | ||
73 | 53 | ||
74 | public void PostInitialise() {} | 54 | public void PostInitialise() {} |
75 | public void Close() {} | 55 | public void Close() {} |
76 | public string Name { get { return "Vegetation Module"; } } | 56 | public string Name { get { return "Vegetation Module"; } } |
77 | 57 | public bool IsSharedModule { get { return false; } } | |
58 | |||
78 | public SceneObjectGroup AddTree( | 59 | public SceneObjectGroup AddTree( |
79 | UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree) | 60 | UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree) |
80 | { | 61 | { |