diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs) | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs index b12d778..6d975af 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs | |||
@@ -38,35 +38,29 @@ using OpenSim.Server.Base; | |||
38 | using OpenSim.Server.Handlers.Base; | 38 | using OpenSim.Server.Handlers.Base; |
39 | using OpenSim.Server.Handlers.Grid; | 39 | using OpenSim.Server.Handlers.Grid; |
40 | using OpenSim.Services.Interfaces; | 40 | using OpenSim.Services.Interfaces; |
41 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | ||
42 | 41 | ||
43 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid |
44 | { | 43 | { |
45 | public class HypergridServiceInConnectorModule : ISharedRegionModule | 44 | public class GridInfoServiceInConnectorModule : ISharedRegionModule |
46 | { | 45 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | private static bool m_Enabled = false; | 47 | private static bool m_Enabled = false; |
49 | 48 | ||
50 | private IConfigSource m_Config; | 49 | private IConfigSource m_Config; |
51 | bool m_Registered = false; | 50 | bool m_Registered = false; |
52 | HypergridServiceInConnector m_HypergridHandler; | ||
53 | 51 | ||
54 | #region IRegionModule interface | 52 | #region IRegionModule interface |
55 | 53 | ||
56 | public void Initialise(IConfigSource config) | 54 | public void Initialise(IConfigSource config) |
57 | { | 55 | { |
58 | //// This module is only on for standalones in hypergrid mode | ||
59 | //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) && | ||
60 | // config.Configs["Startup"].GetBoolean("hypergrid", true); | ||
61 | //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled); | ||
62 | m_Config = config; | 56 | m_Config = config; |
63 | IConfig moduleConfig = config.Configs["Modules"]; | 57 | IConfig moduleConfig = config.Configs["Modules"]; |
64 | if (moduleConfig != null) | 58 | if (moduleConfig != null) |
65 | { | 59 | { |
66 | m_Enabled = moduleConfig.GetBoolean("HypergridServiceInConnector", false); | 60 | m_Enabled = moduleConfig.GetBoolean("GridInfoServiceInConnector", false); |
67 | if (m_Enabled) | 61 | if (m_Enabled) |
68 | { | 62 | { |
69 | m_log.Info("[HGGRID IN CONNECTOR]: Hypergrid Service In Connector enabled"); | 63 | m_log.Info("[GRIDINFO IN CONNECTOR]: GridInfo Service In Connector enabled"); |
70 | } | 64 | } |
71 | 65 | ||
72 | } | 66 | } |
@@ -88,23 +82,19 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
88 | 82 | ||
89 | public string Name | 83 | public string Name |
90 | { | 84 | { |
91 | get { return "HypergridService"; } | 85 | get { return "GridInfoService"; } |
92 | } | 86 | } |
93 | 87 | ||
94 | public void AddRegion(Scene scene) | 88 | public void AddRegion(Scene scene) |
95 | { | 89 | { |
96 | if (!m_Enabled) | 90 | if (!m_Enabled) |
97 | return; | 91 | return; |
98 | |||
99 | } | 92 | } |
100 | 93 | ||
101 | public void RemoveRegion(Scene scene) | 94 | public void RemoveRegion(Scene scene) |
102 | { | 95 | { |
103 | if (!m_Enabled) | 96 | if (!m_Enabled) |
104 | return; | 97 | return; |
105 | |||
106 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
107 | m_HypergridHandler.RemoveRegion(rinfo); | ||
108 | } | 98 | } |
109 | 99 | ||
110 | public void RegionLoaded(Scene scene) | 100 | public void RegionLoaded(Scene scene) |
@@ -116,16 +106,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
116 | { | 106 | { |
117 | m_Registered = true; | 107 | m_Registered = true; |
118 | 108 | ||
119 | m_log.Info("[HypergridService]: Starting..."); | 109 | m_log.Info("[GridInfo]: Starting..."); |
120 | |||
121 | // Object[] args = new Object[] { m_Config, MainServer.Instance }; | ||
122 | 110 | ||
123 | m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); | 111 | new GridInfoServerInConnector(m_Config, MainServer.Instance, "GridInfoService"); |
124 | //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); | ||
125 | } | 112 | } |
126 | 113 | ||
127 | GridRegion rinfo = new GridRegion(scene.RegionInfo); | ||
128 | m_HypergridHandler.AddRegion(rinfo); | ||
129 | } | 114 | } |
130 | 115 | ||
131 | #endregion | 116 | #endregion |