diff options
Update svn properties.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | 296 |
1 files changed, 148 insertions, 148 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index 9145d11..d584a98 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | |||
@@ -1,148 +1,148 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions are met: | 6 | * modification, are permitted provided that the following conditions are met: |
7 | * * Redistributions of source code must retain the above copyright | 7 | * * Redistributions of source code must retain the above copyright |
8 | * notice, this list of conditions and the following disclaimer. | 8 | * notice, this list of conditions and the following disclaimer. |
9 | * * Redistributions in binary form must reproduce the above copyright | 9 | * * Redistributions in binary form must reproduce the above copyright |
10 | * notice, this list of conditions and the following disclaimer in the | 10 | * notice, this list of conditions and the following disclaimer in the |
11 | * documentation and/or other materials provided with the distribution. | 11 | * documentation and/or other materials provided with the distribution. |
12 | * * Neither the name of the OpenSimulator Project nor the | 12 | * * Neither the name of the OpenSimulator Project nor the |
13 | * names of its contributors may be used to endorse or promote products | 13 | * names of its contributors may be used to endorse or promote products |
14 | * derived from this software without specific prior written permission. | 14 | * derived from this software without specific prior written permission. |
15 | * | 15 | * |
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | 16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY |
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | 19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY |
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using log4net; | 28 | using log4net; |
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Services.Connectors; | 34 | using OpenSim.Services.Connectors; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 37 | using OpenSim.Services.Interfaces; |
38 | using OpenSim.Server.Base; | 38 | using OpenSim.Server.Base; |
39 | 39 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | 40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour |
41 | { | 41 | { |
42 | public class RemoteNeighbourServicesConnector : | 42 | public class RemoteNeighbourServicesConnector : |
43 | NeighbourServicesConnector, ISharedRegionModule, INeighbourService | 43 | NeighbourServicesConnector, ISharedRegionModule, INeighbourService |
44 | { | 44 | { |
45 | private static readonly ILog m_log = | 45 | private static readonly ILog m_log = |
46 | LogManager.GetLogger( | 46 | LogManager.GetLogger( |
47 | MethodBase.GetCurrentMethod().DeclaringType); | 47 | MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private bool m_Enabled = false; | 49 | private bool m_Enabled = false; |
50 | private LocalNeighbourServicesConnector m_LocalService; | 50 | private LocalNeighbourServicesConnector m_LocalService; |
51 | private string serviceDll; | 51 | private string serviceDll; |
52 | private List<Scene> m_Scenes = new List<Scene>(); | 52 | private List<Scene> m_Scenes = new List<Scene>(); |
53 | 53 | ||
54 | public string Name | 54 | public string Name |
55 | { | 55 | { |
56 | get { return "RemoteNeighbourServicesConnector"; } | 56 | get { return "RemoteNeighbourServicesConnector"; } |
57 | } | 57 | } |
58 | 58 | ||
59 | public void Initialise(IConfigSource source) | 59 | public void Initialise(IConfigSource source) |
60 | { | 60 | { |
61 | IConfig moduleConfig = source.Configs["Modules"]; | 61 | IConfig moduleConfig = source.Configs["Modules"]; |
62 | if (moduleConfig != null) | 62 | if (moduleConfig != null) |
63 | { | 63 | { |
64 | string name = moduleConfig.GetString("NeighbourServices"); | 64 | string name = moduleConfig.GetString("NeighbourServices"); |
65 | if (name == Name) | 65 | if (name == Name) |
66 | { | 66 | { |
67 | m_LocalService = new LocalNeighbourServicesConnector(); | 67 | m_LocalService = new LocalNeighbourServicesConnector(); |
68 | 68 | ||
69 | //IConfig neighbourConfig = source.Configs["NeighbourService"]; | 69 | //IConfig neighbourConfig = source.Configs["NeighbourService"]; |
70 | //if (neighbourConfig == null) | 70 | //if (neighbourConfig == null) |
71 | //{ | 71 | //{ |
72 | // m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini"); | 72 | // m_log.Error("[NEIGHBOUR CONNECTOR]: NeighbourService missing from OpenSim.ini"); |
73 | // return; | 73 | // return; |
74 | //} | 74 | //} |
75 | //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty); | 75 | //serviceDll = neighbourConfig.GetString("LocalServiceModule", String.Empty); |
76 | //if (serviceDll == String.Empty) | 76 | //if (serviceDll == String.Empty) |
77 | //{ | 77 | //{ |
78 | // m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService"); | 78 | // m_log.Error("[NEIGHBOUR CONNECTOR]: No LocalServiceModule named in section NeighbourService"); |
79 | // return; | 79 | // return; |
80 | //} | 80 | //} |
81 | 81 | ||
82 | m_Enabled = true; | 82 | m_Enabled = true; |
83 | 83 | ||
84 | m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled"); | 84 | m_log.Info("[NEIGHBOUR CONNECTOR]: Remote Neighbour connector enabled"); |
85 | } | 85 | } |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | public void PostInitialise() | 89 | public void PostInitialise() |
90 | { | 90 | { |
91 | //if (m_Enabled) | 91 | //if (m_Enabled) |
92 | //{ | 92 | //{ |
93 | // Object[] args = new Object[] { m_Scenes }; | 93 | // Object[] args = new Object[] { m_Scenes }; |
94 | // m_LocalService = | 94 | // m_LocalService = |
95 | // ServerUtils.LoadPlugin<INeighbourService>(serviceDll, | 95 | // ServerUtils.LoadPlugin<INeighbourService>(serviceDll, |
96 | // args); | 96 | // args); |
97 | 97 | ||
98 | // if (m_LocalService == null) | 98 | // if (m_LocalService == null) |
99 | // { | 99 | // { |
100 | // m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service"); | 100 | // m_log.Error("[NEIGHBOUR CONNECTOR]: Can't load neighbour service"); |
101 | // Unregister(); | 101 | // Unregister(); |
102 | // return; | 102 | // return; |
103 | // } | 103 | // } |
104 | //} | 104 | //} |
105 | } | 105 | } |
106 | 106 | ||
107 | public void Close() | 107 | public void Close() |
108 | { | 108 | { |
109 | } | 109 | } |
110 | 110 | ||
111 | public void AddRegion(Scene scene) | 111 | public void AddRegion(Scene scene) |
112 | { | 112 | { |
113 | if (!m_Enabled) | 113 | if (!m_Enabled) |
114 | return; | 114 | return; |
115 | 115 | ||
116 | m_MapService = scene.CommsManager.GridService; | 116 | m_MapService = scene.CommsManager.GridService; |
117 | m_LocalService.AddRegion(scene); | 117 | m_LocalService.AddRegion(scene); |
118 | scene.RegisterModuleInterface<INeighbourService>(this); | 118 | scene.RegisterModuleInterface<INeighbourService>(this); |
119 | } | 119 | } |
120 | 120 | ||
121 | public void RemoveRegion(Scene scene) | 121 | public void RemoveRegion(Scene scene) |
122 | { | 122 | { |
123 | if (m_Enabled && m_Scenes.Contains(scene)) | 123 | if (m_Enabled && m_Scenes.Contains(scene)) |
124 | m_LocalService.RemoveRegion(scene); | 124 | m_LocalService.RemoveRegion(scene); |
125 | } | 125 | } |
126 | 126 | ||
127 | public void RegionLoaded(Scene scene) | 127 | public void RegionLoaded(Scene scene) |
128 | { | 128 | { |
129 | if (!m_Enabled) | 129 | if (!m_Enabled) |
130 | return; | 130 | return; |
131 | 131 | ||
132 | m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName); | 132 | m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName); |
133 | 133 | ||
134 | } | 134 | } |
135 | 135 | ||
136 | #region INeighbourService | 136 | #region INeighbourService |
137 | 137 | ||
138 | public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | 138 | public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) |
139 | { | 139 | { |
140 | if (m_LocalService.HelloNeighbour(regionHandle, thisRegion)) | 140 | if (m_LocalService.HelloNeighbour(regionHandle, thisRegion)) |
141 | return true; | 141 | return true; |
142 | 142 | ||
143 | return base.HelloNeighbour(regionHandle, thisRegion); | 143 | return base.HelloNeighbour(regionHandle, thisRegion); |
144 | } | 144 | } |
145 | 145 | ||
146 | #endregion INeighbourService | 146 | #endregion INeighbourService |
147 | } | 147 | } |
148 | } | 148 | } |