diff options
author | Revolution | 2010-01-22 18:09:33 -0600 |
---|---|---|
committer | Melanie | 2010-01-23 15:18:52 +0000 |
commit | ec3c31e61e5e540f822891110df9bc978655bbaf (patch) | |
tree | b0b34a239eab48e163a3ca064edcd7567948423c /OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |
parent | add a target position to agent updates to ScenePresence to support alternativ... (diff) | |
download | opensim-SC_OLD-ec3c31e61e5e540f822891110df9bc978655bbaf.zip opensim-SC_OLD-ec3c31e61e5e540f822891110df9bc978655bbaf.tar.gz opensim-SC_OLD-ec3c31e61e5e540f822891110df9bc978655bbaf.tar.bz2 opensim-SC_OLD-ec3c31e61e5e540f822891110df9bc978655bbaf.tar.xz |
Updates all IRegionModules to the new style region modules.
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs index 0f2ba32..4534024 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | |||
@@ -32,6 +32,7 @@ using System.Net; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Text; | 33 | using System.Text; |
34 | using log4net; | 34 | using log4net; |
35 | using Mono.Addins; | ||
35 | using Nini.Config; | 36 | using Nini.Config; |
36 | using Nwc.XmlRpc; | 37 | using Nwc.XmlRpc; |
37 | using OpenMetaverse; | 38 | using OpenMetaverse; |
@@ -42,7 +43,8 @@ using OpenSim.Region.Framework.Scenes; | |||
42 | 43 | ||
43 | namespace OpenSim.Region.CoreModules.InterGrid | 44 | namespace OpenSim.Region.CoreModules.InterGrid |
44 | { | 45 | { |
45 | public class OGSRadmin : IRegionModule | 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
47 | public class OGSRadmin : ISharedRegionModule | ||
46 | { | 48 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | private readonly List<Scene> m_scenes = new List<Scene>(); | 50 | private readonly List<Scene> m_scenes = new List<Scene>(); |
@@ -56,7 +58,6 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
56 | get { return "OGS Supporting RAdmin"; } | 58 | get { return "OGS Supporting RAdmin"; } |
57 | } | 59 | } |
58 | 60 | ||
59 | |||
60 | public void Initialise(IConfigSource source) | 61 | public void Initialise(IConfigSource source) |
61 | { | 62 | { |
62 | m_settings = source; | 63 | m_settings = source; |
@@ -67,6 +68,11 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
67 | 68 | ||
68 | } | 69 | } |
69 | 70 | ||
71 | public Type ReplaceableInterface | ||
72 | { | ||
73 | get { return null; } | ||
74 | } | ||
75 | |||
70 | public void AddRegion(Scene scene) | 76 | public void AddRegion(Scene scene) |
71 | { | 77 | { |
72 | lock (m_scenes) | 78 | lock (m_scenes) |
@@ -77,15 +83,11 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
77 | { | 83 | { |
78 | lock (m_scenes) | 84 | lock (m_scenes) |
79 | m_scenes.Remove(scene); | 85 | m_scenes.Remove(scene); |
86 | MainServer.Instance.RemoveXmlRPCHandler("grid_message"); | ||
80 | } | 87 | } |
81 | 88 | ||
82 | public void RegionLoaded(Scene scene) | 89 | public void RegionLoaded(Scene scene) |
83 | { | 90 | { |
84 | |||
85 | } | ||
86 | |||
87 | public void PostInitialise() | ||
88 | { | ||
89 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) | 91 | if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) |
90 | { | 92 | { |
91 | m_com = m_scenes[0].CommsManager; | 93 | m_com = m_scenes[0].CommsManager; |
@@ -93,21 +95,8 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
93 | } | 95 | } |
94 | } | 96 | } |
95 | 97 | ||
96 | #endregion | 98 | public void PostInitialise() |
97 | |||
98 | #region IRegionModule | ||
99 | |||
100 | public void Initialise(Scene scene, IConfigSource source) | ||
101 | { | ||
102 | m_settings = source; | ||
103 | |||
104 | lock (m_scenes) | ||
105 | m_scenes.Add(scene); | ||
106 | } | ||
107 | |||
108 | public bool IsSharedModule | ||
109 | { | 99 | { |
110 | get { return true; } | ||
111 | } | 100 | } |
112 | 101 | ||
113 | #endregion | 102 | #endregion |