diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/ServiceConnectorsIn | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn')
11 files changed, 63 insertions, 42 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs index 7b4668a..2c882e6 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset | |||
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | private static bool m_Enabled = false; | 47 | private static bool m_Enabled = false; |
48 | 48 | ||
49 | private IConfigSource m_Config; | 49 | private IConfigSource m_Config; |
50 | bool m_Registered = false; | 50 | bool m_Registered = false; |
51 | 51 | ||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset | |||
74 | { | 74 | { |
75 | } | 75 | } |
76 | 76 | ||
77 | public Type ReplaceableInterface | 77 | public Type ReplaceableInterface |
78 | { | 78 | { |
79 | get { return null; } | 79 | get { return null; } |
80 | } | 80 | } |
@@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset | |||
95 | 95 | ||
96 | m_log.Info("[HGAssetService]: Starting..."); | 96 | m_log.Info("[HGAssetService]: Starting..."); |
97 | 97 | ||
98 | 98 | ||
99 | Object[] args = new Object[] { m_Config, MainServer.Instance, "HGAssetService" }; | 99 | Object[] args = new Object[] { m_Config, MainServer.Instance, "HGAssetService" }; |
100 | 100 | ||
101 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); | 101 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs index 2cdffe6..a8c4e3c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication | |||
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | private static bool m_Enabled = false; | 49 | private static bool m_Enabled = false; |
50 | 50 | ||
51 | private IConfigSource m_Config; | 51 | private IConfigSource m_Config; |
52 | bool m_Registered = false; | 52 | bool m_Registered = false; |
53 | 53 | ||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication | |||
77 | { | 77 | { |
78 | } | 78 | } |
79 | 79 | ||
80 | public Type ReplaceableInterface | 80 | public Type ReplaceableInterface |
81 | { | 81 | { |
82 | get { return null; } | 82 | get { return null; } |
83 | } | 83 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs index 22857d0..834cbb7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | private static bool m_Enabled = false; | 49 | private static bool m_Enabled = false; |
50 | 50 | ||
51 | private IConfigSource m_Config; | 51 | private IConfigSource m_Config; |
52 | bool m_Registered = false; | 52 | bool m_Registered = false; |
53 | 53 | ||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid | |||
77 | { | 77 | { |
78 | } | 78 | } |
79 | 79 | ||
80 | public Type ReplaceableInterface | 80 | public Type ReplaceableInterface |
81 | { | 81 | { |
82 | get { return null; } | 82 | get { return null; } |
83 | } | 83 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs index f749295..4f87595 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid | |||
48 | { | 48 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | private static bool m_Enabled = false; | 50 | private static bool m_Enabled = false; |
51 | 51 | ||
52 | private IConfigSource m_Config; | 52 | private IConfigSource m_Config; |
53 | private bool m_Registered = false; | 53 | private bool m_Registered = false; |
54 | private string m_LocalServiceDll = String.Empty; | 54 | private string m_LocalServiceDll = String.Empty; |
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid | |||
88 | { | 88 | { |
89 | } | 89 | } |
90 | 90 | ||
91 | public Type ReplaceableInterface | 91 | public Type ReplaceableInterface |
92 | { | 92 | { |
93 | get { return null; } | 93 | get { return null; } |
94 | } | 94 | } |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid | |||
130 | m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService); | 130 | m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService); |
131 | 131 | ||
132 | m_UASHandler = new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn); | 132 | m_UASHandler = new UserAgentServerConnector(m_Config, MainServer.Instance, friendsConn); |
133 | 133 | ||
134 | new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService"); | 134 | new HeloServiceInConnector(m_Config, MainServer.Instance, "HeloService"); |
135 | 135 | ||
136 | new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService", friendsConn); | 136 | new HGFriendsServerConnector(m_Config, MainServer.Instance, "HGFriendsService", friendsConn); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs index 0a4e736..61e37a9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory | |||
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | private static bool m_Enabled = false; | 47 | private static bool m_Enabled = false; |
48 | 48 | ||
49 | private IConfigSource m_Config; | 49 | private IConfigSource m_Config; |
50 | bool m_Registered = false; | 50 | bool m_Registered = false; |
51 | 51 | ||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory | |||
73 | { | 73 | { |
74 | } | 74 | } |
75 | 75 | ||
76 | public Type ReplaceableInterface | 76 | public Type ReplaceableInterface |
77 | { | 77 | { |
78 | get { return null; } | 78 | get { return null; } |
79 | } | 79 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs index 2fd21be..fb8c306 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land | |||
84 | { | 84 | { |
85 | } | 85 | } |
86 | 86 | ||
87 | public Type ReplaceableInterface | 87 | public Type ReplaceableInterface |
88 | { | 88 | { |
89 | get { return null; } | 89 | get { return null; } |
90 | } | 90 | } |
@@ -126,15 +126,36 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land | |||
126 | 126 | ||
127 | public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess) | 127 | public LandData GetLandData(UUID scopeID, ulong regionHandle, uint x, uint y, out byte regionAccess) |
128 | { | 128 | { |
129 | m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}", | 129 | // m_log.DebugFormat("[LAND IN CONNECTOR]: GetLandData for {0}. Count = {1}", |
130 | regionHandle, m_Scenes.Count); | 130 | // regionHandle, m_Scenes.Count); |
131 | |||
132 | uint rx = 0, ry = 0; | ||
133 | Util.RegionHandleToWorldLoc(regionHandle, out rx, out ry); | ||
134 | rx += x; | ||
135 | ry += y; | ||
131 | foreach (Scene s in m_Scenes) | 136 | foreach (Scene s in m_Scenes) |
132 | { | 137 | { |
133 | if (s.RegionInfo.RegionHandle == regionHandle) | 138 | uint t = s.RegionInfo.WorldLocX; |
139 | if( rx < t) | ||
140 | continue; | ||
141 | t += s.RegionInfo.RegionSizeX; | ||
142 | if( rx >= t) | ||
143 | continue; | ||
144 | t = s.RegionInfo.WorldLocY; | ||
145 | if( ry < t) | ||
146 | continue; | ||
147 | t += s.RegionInfo.RegionSizeY; | ||
148 | if( ry < t) | ||
134 | { | 149 | { |
135 | m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from"); | 150 | // m_log.Debug("[LAND IN CONNECTOR]: Found region to GetLandData from"); |
151 | x = rx - s.RegionInfo.WorldLocX; | ||
152 | y = ry - s.RegionInfo.WorldLocY; | ||
136 | regionAccess = s.RegionInfo.AccessLevel; | 153 | regionAccess = s.RegionInfo.AccessLevel; |
137 | return s.GetLandData(x, y); | 154 | LandData land = s.GetLandData(x, y); |
155 | IDwellModule dwellModule = s.RequestModuleInterface<IDwellModule>(); | ||
156 | if (dwellModule != null) | ||
157 | land.Dwell = dwellModule.GetDwell(land); | ||
158 | return land; | ||
138 | } | 159 | } |
139 | } | 160 | } |
140 | m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); | 161 | m_log.DebugFormat("[LAND IN CONNECTOR]: region handle {0} not found", regionHandle); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs index 425febd..065dd94 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login | |||
84 | { | 84 | { |
85 | } | 85 | } |
86 | 86 | ||
87 | public Type ReplaceableInterface | 87 | public Type ReplaceableInterface |
88 | { | 88 | { |
89 | get { return null; } | 89 | get { return null; } |
90 | } | 90 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login | |||
113 | { | 113 | { |
114 | if (!m_Enabled) | 114 | if (!m_Enabled) |
115 | return; | 115 | return; |
116 | 116 | ||
117 | if (!m_Registered) | 117 | if (!m_Registered) |
118 | { | 118 | { |
119 | m_Registered = true; | 119 | m_Registered = true; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs index c14bce7..a75a156 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage | |||
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | private static bool m_Enabled = false; | 49 | private static bool m_Enabled = false; |
50 | 50 | ||
51 | private IConfigSource m_Config; | 51 | private IConfigSource m_Config; |
52 | 52 | ||
53 | #region Region Module interface | 53 | #region Region Module interface |
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage | |||
75 | { | 75 | { |
76 | } | 76 | } |
77 | 77 | ||
78 | public Type ReplaceableInterface | 78 | public Type ReplaceableInterface |
79 | { | 79 | { |
80 | get { return null; } | 80 | get { return null; } |
81 | } | 81 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs index 6bf47cb..09c545c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour | |||
83 | { | 83 | { |
84 | } | 84 | } |
85 | 85 | ||
86 | public Type ReplaceableInterface | 86 | public Type ReplaceableInterface |
87 | { | 87 | { |
88 | get { return null; } | 88 | get { return null; } |
89 | } | 89 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs index 57d1132..7ba39d4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation | |||
77 | { | 77 | { |
78 | } | 78 | } |
79 | 79 | ||
80 | public Type ReplaceableInterface | 80 | public Type ReplaceableInterface |
81 | { | 81 | { |
82 | get { return null; } | 82 | get { return null; } |
83 | } | 83 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs index 4701ee6..2e6f472 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs | |||
@@ -77,65 +77,65 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile | |||
77 | { | 77 | { |
78 | get; private set; | 78 | get; private set; |
79 | } | 79 | } |
80 | 80 | ||
81 | public Type ReplaceableInterface | 81 | public Type ReplaceableInterface |
82 | { | 82 | { |
83 | get { return null; } | 83 | get { return null; } |
84 | } | 84 | } |
85 | 85 | ||
86 | public LocalUserProfilesServicesConnector() | 86 | public LocalUserProfilesServicesConnector() |
87 | { | 87 | { |
88 | m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params"); | 88 | //m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params"); |
89 | } | 89 | } |
90 | 90 | ||
91 | public LocalUserProfilesServicesConnector(IConfigSource source) | 91 | public LocalUserProfilesServicesConnector(IConfigSource source) |
92 | { | 92 | { |
93 | m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly."); | 93 | //m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly."); |
94 | InitialiseService(source); | 94 | InitialiseService(source); |
95 | } | 95 | } |
96 | 96 | ||
97 | public void InitialiseService(IConfigSource source) | 97 | public void InitialiseService(IConfigSource source) |
98 | { | 98 | { |
99 | ConfigName = "UserProfilesService"; | 99 | ConfigName = "UserProfilesService"; |
100 | 100 | ||
101 | // Instantiate the request handler | 101 | // Instantiate the request handler |
102 | IHttpServer Server = MainServer.Instance; | 102 | IHttpServer Server = MainServer.Instance; |
103 | 103 | ||
104 | IConfig config = source.Configs[ConfigName]; | 104 | IConfig config = source.Configs[ConfigName]; |
105 | if (config == null) | 105 | if (config == null) |
106 | { | 106 | { |
107 | m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini"); | 107 | //m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini"); |
108 | return; | 108 | return; |
109 | } | 109 | } |
110 | 110 | ||
111 | if(!config.GetBoolean("Enabled",false)) | 111 | if(!config.GetBoolean("Enabled",false)) |
112 | { | 112 | { |
113 | Enabled = false; | 113 | Enabled = false; |
114 | return; | 114 | return; |
115 | } | 115 | } |
116 | 116 | ||
117 | Enabled = true; | 117 | Enabled = true; |
118 | 118 | ||
119 | string serviceDll = config.GetString("LocalServiceModule", | 119 | string serviceDll = config.GetString("LocalServiceModule", |
120 | String.Empty); | 120 | String.Empty); |
121 | 121 | ||
122 | if (serviceDll == String.Empty) | 122 | if (serviceDll == String.Empty) |
123 | { | 123 | { |
124 | m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService"); | 124 | m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService"); |
125 | return; | 125 | return; |
126 | } | 126 | } |
127 | 127 | ||
128 | Object[] args = new Object[] { source, ConfigName }; | 128 | Object[] args = new Object[] { source, ConfigName }; |
129 | ServiceModule = | 129 | ServiceModule = |
130 | ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll, | 130 | ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll, |
131 | args); | 131 | args); |
132 | 132 | ||
133 | if (ServiceModule == null) | 133 | if (ServiceModule == null) |
134 | { | 134 | { |
135 | m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service"); | 135 | m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service"); |
136 | return; | 136 | return; |
137 | } | 137 | } |
138 | 138 | ||
139 | Enabled = true; | 139 | Enabled = true; |
140 | 140 | ||
141 | JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule); | 141 | JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule); |
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile | |||
196 | { | 196 | { |
197 | if (!Enabled) | 197 | if (!Enabled) |
198 | return; | 198 | return; |
199 | 199 | ||
200 | lock (regions) | 200 | lock (regions) |
201 | { | 201 | { |
202 | if (regions.ContainsKey(scene.RegionInfo.RegionID)) | 202 | if (regions.ContainsKey(scene.RegionInfo.RegionID)) |
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile | |||
209 | void IRegionModuleBase.RemoveRegion(Scene scene) | 209 | void IRegionModuleBase.RemoveRegion(Scene scene) |
210 | { | 210 | { |
211 | if (!Enabled) | 211 | if (!Enabled) |
212 | return; | 212 | return; |
213 | 213 | ||
214 | lock (regions) | 214 | lock (regions) |
215 | { | 215 | { |
@@ -221,8 +221,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile | |||
221 | void IRegionModuleBase.RegionLoaded(Scene scene) | 221 | void IRegionModuleBase.RegionLoaded(Scene scene) |
222 | { | 222 | { |
223 | if (!Enabled) | 223 | if (!Enabled) |
224 | return; | 224 | return; |
225 | } | 225 | } |
226 | #endregion | 226 | #endregion |
227 | } | 227 | } |
228 | } \ No newline at end of file | 228 | } |