aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2012-11-09 21:58:39 -0800
committerDiva Canto2012-11-09 21:58:39 -0800
commit492515cf3f22d7f4ebdf96c924e51f7462eb0aa8 (patch)
treeaad03a00cf71252bc649f224231cbd208426ebce /OpenSim/Region/CoreModules
parentMinor improvement in the MapSearchModule. Stop blocking the client thread if ... (diff)
downloadopensim-SC_OLD-492515cf3f22d7f4ebdf96c924e51f7462eb0aa8.zip
opensim-SC_OLD-492515cf3f22d7f4ebdf96c924e51f7462eb0aa8.tar.gz
opensim-SC_OLD-492515cf3f22d7f4ebdf96c924e51f7462eb0aa8.tar.bz2
opensim-SC_OLD-492515cf3f22d7f4ebdf96c924e51f7462eb0aa8.tar.xz
One more module converted: Vegetation.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml1
-rw-r--r--OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs26
2 files changed, 22 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 8fc70e2..14dc22a 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -41,6 +41,7 @@
41 <RegionModule id="SunModule" type="OpenSim.Region.CoreModules.SunModule"/> 41 <RegionModule id="SunModule" type="OpenSim.Region.CoreModules.SunModule"/>
42 <RegionModule id="WindModule" type="OpenSim.Region.CoreModules.WindModule"/> 42 <RegionModule id="WindModule" type="OpenSim.Region.CoreModules.WindModule"/>
43 <RegionModule id="MapSearchModule" type="OpenSim.Region.CoreModules.World.WorldMap.MapSearchModule"/> 43 <RegionModule id="MapSearchModule" type="OpenSim.Region.CoreModules.World.WorldMap.MapSearchModule"/>
44 <RegionModule id="VegetationModule" type="OpenSim.Region.CoreModules.Avatar.Vegetation.VegetationModule"/>
44 <!-- Service connectors OUT modules --> 45 <!-- Service connectors OUT modules -->
45 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" /> 46 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
46 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" /> 47 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index f5f35bb..528da0e3 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Scenes;
36 36
37namespace OpenSim.Region.CoreModules.Avatar.Vegetation 37namespace OpenSim.Region.CoreModules.Avatar.Vegetation
38{ 38{
39 public class VegetationModule : IRegionModule, IVegetationModule 39 public class VegetationModule : INonSharedRegionModule, IVegetationModule
40 { 40 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
@@ -45,16 +45,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
45 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 };
46 public PCode[] CreationCapabilities { get { return creationCapabilities; } } 46 public PCode[] CreationCapabilities { get { return creationCapabilities; } }
47 47
48 public void Initialise(Scene scene, IConfigSource source) 48 public void Initialise(IConfigSource source)
49 {
50 }
51
52 public void AddRegion(Scene scene)
49 { 53 {
50 m_scene = scene; 54 m_scene = scene;
51 m_scene.RegisterModuleInterface<IVegetationModule>(this); 55 m_scene.RegisterModuleInterface<IVegetationModule>(this);
52 } 56 }
53 57
54 public void PostInitialise() {} 58 public void RemoveRegion(Scene scene)
59 {
60 m_scene.UnregisterModuleInterface<IVegetationModule>(this);
61 }
62
55 public void Close() {} 63 public void Close() {}
56 public string Name { get { return "Vegetation Module"; } } 64 public string Name { get { return "Vegetation Module"; } }
57 public bool IsSharedModule { get { return false; } } 65
66 public Type ReplaceableInterface
67 {
68 get { return null; }
69 }
70
71 public void RegionLoaded(Scene scene)
72 {
73 }
58 74
59 public SceneObjectGroup AddTree( 75 public SceneObjectGroup AddTree(
60 UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree) 76 UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree)