diff options
author | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-11-14 02:30:12 +0000 |
commit | 564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c (patch) | |
tree | 1d046904229e0a6c36481c255ceb71eda7c72872 /OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour | |
parent | Stop Prebuild from generating <copy> statements which unnecessarily copy file... (diff) | |
parent | Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll. (diff) | |
download | opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.zip opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.gz opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.bz2 opensim-SC_OLD-564fe35d4d88009f7ca9f7c1b8e3eafb13a2cc1c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour')
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index 7a90686..fd89428 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using log4net; | 31 | using log4net; |
32 | using Mono.Addins; | ||
32 | using Nini.Config; | 33 | using Nini.Config; |
33 | using OpenMetaverse; | 34 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
@@ -39,6 +40,7 @@ using OpenSim.Services.Interfaces; | |||
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour |
41 | { | 42 | { |
43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalNeighbourServicesConnector")] | ||
42 | public class LocalNeighbourServicesConnector : | 44 | public class LocalNeighbourServicesConnector : |
43 | ISharedRegionModule, INeighbourService | 45 | ISharedRegionModule, INeighbourService |
44 | { | 46 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index c6fc2a1..e6772f3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using log4net; | 28 | using log4net; |
29 | using Mono.Addins; | ||
29 | using System; | 30 | using System; |
30 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
31 | using System.Reflection; | 32 | using System.Reflection; |
@@ -39,6 +40,7 @@ using OpenSim.Server.Base; | |||
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour |
41 | { | 42 | { |
43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteNeighbourServicesConnector")] | ||
42 | public class RemoteNeighbourServicesConnector : | 44 | public class RemoteNeighbourServicesConnector : |
43 | NeighbourServicesConnector, ISharedRegionModule, INeighbourService | 45 | NeighbourServicesConnector, ISharedRegionModule, INeighbourService |
44 | { | 46 | { |