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/GridUser | |
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/GridUser')
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs index 90fe69e..5734334 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/LocalGridUserServiceConnector.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 OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
@@ -39,6 +40,7 @@ using OpenMetaverse; | |||
39 | 40 | ||
40 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | 41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser |
41 | { | 42 | { |
43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalGridUserServicesConnector")] | ||
42 | public class LocalGridUserServicesConnector : ISharedRegionModule, IGridUserService | 44 | public class LocalGridUserServicesConnector : ISharedRegionModule, IGridUserService |
43 | { | 45 | { |
44 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs index 04acf67..f7e6eb8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/RemoteGridUserServiceConnector.cs | |||
@@ -36,10 +36,12 @@ using OpenSim.Services.Connectors; | |||
36 | 36 | ||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using log4net; | 38 | using log4net; |
39 | using Mono.Addins; | ||
39 | using Nini.Config; | 40 | using Nini.Config; |
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser |
42 | { | 43 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteGridUserServicesConnector")] | ||
43 | public class RemoteGridUserServicesConnector : ISharedRegionModule, IGridUserService | 45 | public class RemoteGridUserServicesConnector : ISharedRegionModule, IGridUserService |
44 | { | 46 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |