diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/ServiceConnectorsOut | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut')
31 files changed, 127 insertions, 127 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs index 41ae53f..5cd68d9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/LocalAgentPreferencesServiceConnector.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences | |||
50 | 50 | ||
51 | #region ISharedRegionModule | 51 | #region ISharedRegionModule |
52 | 52 | ||
53 | public Type ReplaceableInterface | 53 | public Type ReplaceableInterface |
54 | { | 54 | { |
55 | get { return null; } | 55 | get { return null; } |
56 | } | 56 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs index a827c4c..d60236a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/AgentPreferences/RemoteAgentPreferencesServiceConnector.cs | |||
@@ -44,14 +44,14 @@ using Nini.Config; | |||
44 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences | 44 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.AgentPreferences |
45 | { | 45 | { |
46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAgentPreferencesServicesConnector")] | 46 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteAgentPreferencesServicesConnector")] |
47 | public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector, | 47 | public class RemoteAgentPreferencesServicesConnector : AgentPreferencesServicesConnector, |
48 | ISharedRegionModule, IAgentPreferencesService | 48 | ISharedRegionModule, IAgentPreferencesService |
49 | { | 49 | { |
50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 50 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
51 | 51 | ||
52 | private bool m_Enabled = false; | 52 | private bool m_Enabled = false; |
53 | 53 | ||
54 | public Type ReplaceableInterface | 54 | public Type ReplaceableInterface |
55 | { | 55 | { |
56 | get { return null; } | 56 | get { return null; } |
57 | } | 57 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs index 31d1129..f5aa971 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
59 | 59 | ||
60 | private AssetPermissions m_AssetPerms; | 60 | private AssetPermissions m_AssetPerms; |
61 | 61 | ||
62 | public Type ReplaceableInterface | 62 | public Type ReplaceableInterface |
63 | { | 63 | { |
64 | get { return null; } | 64 | get { return null; } |
65 | } | 65 | } |
@@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
159 | { | 159 | { |
160 | if (!m_Enabled) | 160 | if (!m_Enabled) |
161 | return; | 161 | return; |
162 | 162 | ||
163 | m_aScene = scene; | 163 | m_aScene = scene; |
164 | 164 | ||
165 | m_aScene.RegisterModuleInterface<IAssetService>(this); | 165 | m_aScene.RegisterModuleInterface<IAssetService>(this); |
@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
180 | 180 | ||
181 | if (!(m_Cache is ISharedRegionModule)) | 181 | if (!(m_Cache is ISharedRegionModule)) |
182 | m_Cache = null; | 182 | m_Cache = null; |
183 | 183 | ||
184 | } | 184 | } |
185 | 185 | ||
186 | m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName); | 186 | m_log.InfoFormat("[HG ASSET CONNECTOR]: Enabled hypergrid asset broker for region {0}", scene.RegionInfo.RegionName); |
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
206 | { | 206 | { |
207 | //m_log.DebugFormat("[HG ASSET CONNECTOR]: Get {0}", id); | 207 | //m_log.DebugFormat("[HG ASSET CONNECTOR]: Get {0}", id); |
208 | AssetBase asset = null; | 208 | AssetBase asset = null; |
209 | 209 | ||
210 | if (m_Cache != null) | 210 | if (m_Cache != null) |
211 | { | 211 | { |
212 | asset = m_Cache.Get(id); | 212 | asset = m_Cache.Get(id); |
@@ -247,7 +247,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
247 | public AssetMetadata GetMetadata(string id) | 247 | public AssetMetadata GetMetadata(string id) |
248 | { | 248 | { |
249 | AssetBase asset = null; | 249 | AssetBase asset = null; |
250 | 250 | ||
251 | if (m_Cache != null) | 251 | if (m_Cache != null) |
252 | { | 252 | { |
253 | if (m_Cache != null) | 253 | if (m_Cache != null) |
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
270 | public byte[] GetData(string id) | 270 | public byte[] GetData(string id) |
271 | { | 271 | { |
272 | AssetBase asset = null; | 272 | AssetBase asset = null; |
273 | 273 | ||
274 | if (m_Cache != null) | 274 | if (m_Cache != null) |
275 | { | 275 | { |
276 | if (m_Cache != null) | 276 | if (m_Cache != null) |
@@ -290,7 +290,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
290 | public bool Get(string id, Object sender, AssetRetrieved handler) | 290 | public bool Get(string id, Object sender, AssetRetrieved handler) |
291 | { | 291 | { |
292 | AssetBase asset = null; | 292 | AssetBase asset = null; |
293 | 293 | ||
294 | if (m_Cache != null) | 294 | if (m_Cache != null) |
295 | asset = m_Cache.Get(id); | 295 | asset = m_Cache.Get(id); |
296 | 296 | ||
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
348 | 348 | ||
349 | bool isHG = IsHG(asset.ID); | 349 | bool isHG = IsHG(asset.ID); |
350 | if ((m_Cache != null) && !isHG) | 350 | if ((m_Cache != null) && !isHG) |
351 | // Don't store it in the cache if the asset is to | 351 | // Don't store it in the cache if the asset is to |
352 | // be sent to the other grid, because this is already | 352 | // be sent to the other grid, because this is already |
353 | // a copy of the local asset. | 353 | // a copy of the local asset. |
354 | m_Cache.Cache(asset); | 354 | m_Cache.Cache(asset); |
@@ -366,7 +366,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
366 | 366 | ||
367 | if (String.IsNullOrEmpty(id)) | 367 | if (String.IsNullOrEmpty(id)) |
368 | return string.Empty; | 368 | return string.Empty; |
369 | 369 | ||
370 | if(asset.ID != id) | 370 | if(asset.ID != id) |
371 | { | 371 | { |
372 | asset.ID = id; | 372 | asset.ID = id; |
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
380 | public bool UpdateContent(string id, byte[] data) | 380 | public bool UpdateContent(string id, byte[] data) |
381 | { | 381 | { |
382 | AssetBase asset = null; | 382 | AssetBase asset = null; |
383 | 383 | ||
384 | if (m_Cache != null) | 384 | if (m_Cache != null) |
385 | asset = m_Cache.Get(id); | 385 | asset = m_Cache.Get(id); |
386 | 386 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index d5d6667..7190aa0 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
50 | 50 | ||
51 | private bool m_Enabled = false; | 51 | private bool m_Enabled = false; |
52 | 52 | ||
53 | public Type ReplaceableInterface | 53 | public Type ReplaceableInterface |
54 | { | 54 | { |
55 | get { return null; } | 55 | get { return null; } |
56 | } | 56 | } |
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
155 | public AssetBase Get(string id) | 155 | public AssetBase Get(string id) |
156 | { | 156 | { |
157 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Synchronously requesting asset {0}", id); | 157 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Synchronously requesting asset {0}", id); |
158 | 158 | ||
159 | AssetBase asset = null; | 159 | AssetBase asset = null; |
160 | if (m_Cache != null) | 160 | if (m_Cache != null) |
161 | asset = m_Cache.Get(id); | 161 | asset = m_Cache.Get(id); |
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
169 | // if (null == asset) | 169 | // if (null == asset) |
170 | // m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not synchronously find asset with id {0}", id); | 170 | // m_log.WarnFormat("[LOCAL ASSET SERVICES CONNECTOR]: Could not synchronously find asset with id {0}", id); |
171 | } | 171 | } |
172 | 172 | ||
173 | return asset; | 173 | return asset; |
174 | } | 174 | } |
175 | 175 | ||
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
193 | return asset.Metadata; | 193 | return asset.Metadata; |
194 | 194 | ||
195 | asset = m_AssetService.Get(id); | 195 | asset = m_AssetService.Get(id); |
196 | if (asset != null) | 196 | if (asset != null) |
197 | { | 197 | { |
198 | if (m_Cache != null) | 198 | if (m_Cache != null) |
199 | m_Cache.Cache(asset); | 199 | m_Cache.Cache(asset); |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
229 | public bool Get(string id, Object sender, AssetRetrieved handler) | 229 | public bool Get(string id, Object sender, AssetRetrieved handler) |
230 | { | 230 | { |
231 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Asynchronously requesting asset {0}", id); | 231 | // m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Asynchronously requesting asset {0}", id); |
232 | 232 | ||
233 | if (m_Cache != null) | 233 | if (m_Cache != null) |
234 | { | 234 | { |
235 | AssetBase asset = m_Cache.Get(id); | 235 | AssetBase asset = m_Cache.Get(id); |
@@ -264,7 +264,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
264 | { | 264 | { |
265 | if (m_Cache != null) | 265 | if (m_Cache != null) |
266 | m_Cache.Cache(asset); | 266 | m_Cache.Cache(asset); |
267 | 267 | ||
268 | if (asset.Local) | 268 | if (asset.Local) |
269 | { | 269 | { |
270 | // m_log.DebugFormat( | 270 | // m_log.DebugFormat( |
@@ -278,7 +278,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
278 | // m_log.DebugFormat( | 278 | // m_log.DebugFormat( |
279 | // "[LOCAL ASSET SERVICE CONNECTOR]: Passing {0} {1} on to asset service for storage, status Temporary = {2}, Local = {3}", | 279 | // "[LOCAL ASSET SERVICE CONNECTOR]: Passing {0} {1} on to asset service for storage, status Temporary = {2}, Local = {3}", |
280 | // asset.Name, asset.ID, asset.Temporary, asset.Local); | 280 | // asset.Name, asset.ID, asset.Temporary, asset.Local); |
281 | 281 | ||
282 | return m_AssetService.Store(asset); | 282 | return m_AssetService.Store(asset); |
283 | } | 283 | } |
284 | } | 284 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs index ff04f9d..1225ab5 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/RemoteAssetServiceConnector.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
50 | private bool m_Enabled = false; | 50 | private bool m_Enabled = false; |
51 | private IAssetCache m_Cache; | 51 | private IAssetCache m_Cache; |
52 | 52 | ||
53 | public Type ReplaceableInterface | 53 | public Type ReplaceableInterface |
54 | { | 54 | { |
55 | get { return null; } | 55 | get { return null; } |
56 | } | 56 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs index f027810..8017245 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
53 | 53 | ||
54 | #region ISharedRegionModule | 54 | #region ISharedRegionModule |
55 | 55 | ||
56 | public Type ReplaceableInterface | 56 | public Type ReplaceableInterface |
57 | { | 57 | { |
58 | get { return null; } | 58 | get { return null; } |
59 | } | 59 | } |
@@ -143,13 +143,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
143 | { | 143 | { |
144 | // Not implemented at the regions | 144 | // Not implemented at the regions |
145 | realID = UUID.Zero; | 145 | realID = UUID.Zero; |
146 | return string.Empty; | 146 | return string.Empty; |
147 | } | 147 | } |
148 | 148 | ||
149 | public string Authenticate(UUID principalID, string password, int lifetime) | 149 | public string Authenticate(UUID principalID, string password, int lifetime) |
150 | { | 150 | { |
151 | // Not implemented at the regions | 151 | // Not implemented at the regions |
152 | return string.Empty; | 152 | return string.Empty; |
153 | } | 153 | } |
154 | 154 | ||
155 | public bool Verify(UUID principalID, string token, int lifetime) | 155 | public bool Verify(UUID principalID, string token, int lifetime) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs index 7cb8b22..fd1d802 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication | |||
47 | 47 | ||
48 | private bool m_Enabled = false; | 48 | private bool m_Enabled = false; |
49 | 49 | ||
50 | public Type ReplaceableInterface | 50 | public Type ReplaceableInterface |
51 | { | 51 | { |
52 | get { return null; } | 52 | get { return null; } |
53 | } | 53 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs index 1acb695..0be0676 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
53 | 53 | ||
54 | private bool m_Enabled = false; | 54 | private bool m_Enabled = false; |
55 | 55 | ||
56 | public Type ReplaceableInterface | 56 | public Type ReplaceableInterface |
57 | { | 57 | { |
58 | get { return null; } | 58 | get { return null; } |
59 | } | 59 | } |
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
66 | public void Initialise(IConfigSource source) | 66 | public void Initialise(IConfigSource source) |
67 | { | 67 | { |
68 | m_log.Info("[AUTHORIZATION CONNECTOR]: Initialise"); | 68 | m_log.Info("[AUTHORIZATION CONNECTOR]: Initialise"); |
69 | 69 | ||
70 | IConfig moduleConfig = source.Configs["Modules"]; | 70 | IConfig moduleConfig = source.Configs["Modules"]; |
71 | if (moduleConfig != null) | 71 | if (moduleConfig != null) |
72 | { | 72 | { |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index b8d409d..f312b0d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
51 | private bool m_Enabled = false; | 51 | private bool m_Enabled = false; |
52 | private List<Scene> m_scenes = new List<Scene>(); | 52 | private List<Scene> m_scenes = new List<Scene>(); |
53 | 53 | ||
54 | public Type ReplaceableInterface | 54 | public Type ReplaceableInterface |
55 | { | 55 | { |
56 | get { return null; } | 56 | get { return null; } |
57 | } | 57 | } |
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
103 | m_scenes.Add(scene); | 103 | m_scenes.Add(scene); |
104 | scene.RegisterModuleInterface<IAuthorizationService>(this); | 104 | scene.RegisterModuleInterface<IAuthorizationService>(this); |
105 | } | 105 | } |
106 | 106 | ||
107 | } | 107 | } |
108 | 108 | ||
109 | public void RemoveRegion(Scene scene) | 109 | public void RemoveRegion(Scene scene) |
@@ -118,16 +118,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
118 | m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: Enabled remote authorization for region {0}", scene.RegionInfo.RegionName); | 118 | m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: Enabled remote authorization for region {0}", scene.RegionInfo.RegionName); |
119 | 119 | ||
120 | } | 120 | } |
121 | 121 | ||
122 | public bool IsAuthorizedForRegion( | 122 | public bool IsAuthorizedForRegion( |
123 | string userID, string firstName, string lastName, string regionID, out string message) | 123 | string userID, string firstName, string lastName, string regionID, out string message) |
124 | { | 124 | { |
125 | m_log.InfoFormat( | 125 | m_log.InfoFormat( |
126 | "[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID); | 126 | "[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID); |
127 | 127 | ||
128 | bool isAuthorized = true; | 128 | bool isAuthorized = true; |
129 | message = String.Empty; | 129 | message = String.Empty; |
130 | 130 | ||
131 | // get the scene this call is being made for | 131 | // get the scene this call is being made for |
132 | Scene scene = null; | 132 | Scene scene = null; |
133 | lock (m_scenes) | 133 | lock (m_scenes) |
@@ -140,11 +140,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
140 | } | 140 | } |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | if (scene != null) | 144 | if (scene != null) |
145 | { | 145 | { |
146 | string mail = String.Empty; | 146 | string mail = String.Empty; |
147 | 147 | ||
148 | UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID)); | 148 | UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, new UUID(userID)); |
149 | 149 | ||
150 | //if account not found, we assume its a foreign visitor from HG, else use account data... | 150 | //if account not found, we assume its a foreign visitor from HG, else use account data... |
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
165 | "[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0}", | 165 | "[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0}", |
166 | regionID); | 166 | regionID); |
167 | } | 167 | } |
168 | 168 | ||
169 | return isAuthorized; | 169 | return isAuthorized; |
170 | } | 170 | } |
171 | } | 171 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs index c3ef588..42f6c3f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
54 | 54 | ||
55 | #region ISharedRegionModule | 55 | #region ISharedRegionModule |
56 | 56 | ||
57 | public Type ReplaceableInterface | 57 | public Type ReplaceableInterface |
58 | { | 58 | { |
59 | get { return null; } | 59 | get { return null; } |
60 | } | 60 | } |
@@ -144,12 +144,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
144 | { | 144 | { |
145 | return m_AvatarService.GetAppearance(userID); | 145 | return m_AvatarService.GetAppearance(userID); |
146 | } | 146 | } |
147 | 147 | ||
148 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) | 148 | public bool SetAppearance(UUID userID, AvatarAppearance appearance) |
149 | { | 149 | { |
150 | return m_AvatarService.SetAppearance(userID,appearance); | 150 | return m_AvatarService.SetAppearance(userID,appearance); |
151 | } | 151 | } |
152 | 152 | ||
153 | public AvatarData GetAvatar(UUID userID) | 153 | public AvatarData GetAvatar(UUID userID) |
154 | { | 154 | { |
155 | return m_AvatarService.GetAvatar(userID); | 155 | return m_AvatarService.GetAvatar(userID); |
@@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
174 | { | 174 | { |
175 | return m_AvatarService.RemoveItems(userID, names); | 175 | return m_AvatarService.RemoveItems(userID, names); |
176 | } | 176 | } |
177 | 177 | ||
178 | #endregion | 178 | #endregion |
179 | 179 | ||
180 | } | 180 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs index a087aea..37cfbbc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
47 | 47 | ||
48 | private bool m_Enabled = false; | 48 | private bool m_Enabled = false; |
49 | 49 | ||
50 | public Type ReplaceableInterface | 50 | public Type ReplaceableInterface |
51 | { | 51 | { |
52 | get { return null; } | 52 | get { return null; } |
53 | } | 53 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 70733fc..d220568 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
64 | public LocalGridServicesConnector(IConfigSource source) | 64 | public LocalGridServicesConnector(IConfigSource source) |
65 | { | 65 | { |
66 | m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader); | 66 | m_log.DebugFormat("{0} LocalGridServicesConnector instantiated directly.", LogHeader); |
67 | InitialiseService(source, null); | 67 | InitialiseService(source, null); |
68 | } | 68 | } |
69 | 69 | ||
70 | public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache) | 70 | public LocalGridServicesConnector(IConfigSource source, RegionInfoCache regionInfoCache) |
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
75 | 75 | ||
76 | #region ISharedRegionModule | 76 | #region ISharedRegionModule |
77 | 77 | ||
78 | public Type ReplaceableInterface | 78 | public Type ReplaceableInterface |
79 | { | 79 | { |
80 | get { return null; } | 80 | get { return null; } |
81 | } | 81 | } |
@@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
92 | { | 92 | { |
93 | string name = moduleConfig.GetString("GridServices", ""); | 93 | string name = moduleConfig.GetString("GridServices", ""); |
94 | if (name == Name) | 94 | if (name == Name) |
95 | { | 95 | { |
96 | if(InitialiseService(source, null)) | 96 | if(InitialiseService(source, null)) |
97 | m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); | 97 | m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); |
98 | } | 98 | } |
@@ -190,8 +190,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
190 | // This shouldn't happen | 190 | // This shouldn't happen |
191 | if (region == null) | 191 | if (region == null) |
192 | return; | 192 | return; |
193 | 193 | ||
194 | m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region); | 194 | m_RegionInfoCache.CacheNearNeighbour(region.ScopeID, region); |
195 | } | 195 | } |
196 | 196 | ||
197 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) | 197 | public string RegisterRegion(UUID scopeID, GridRegion regionInfo) |
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
206 | 206 | ||
207 | public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID) | 207 | public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID) |
208 | { | 208 | { |
209 | return m_GridService.GetNeighbours(scopeID, regionID); | 209 | return m_GridService.GetNeighbours(scopeID, regionID); |
210 | } | 210 | } |
211 | 211 | ||
212 | public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) | 212 | public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) |
@@ -282,7 +282,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
282 | { | 282 | { |
283 | return m_GridService.GetHyperlinks(scopeID); | 283 | return m_GridService.GetHyperlinks(scopeID); |
284 | } | 284 | } |
285 | 285 | ||
286 | public int GetRegionFlags(UUID scopeID, UUID regionID) | 286 | public int GetRegionFlags(UUID scopeID, UUID regionID) |
287 | { | 287 | { |
288 | return m_GridService.GetRegionFlags(scopeID, regionID); | 288 | return m_GridService.GetRegionFlags(scopeID, regionID); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs index 5eb525b..84e52f7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
44 | // private static readonly ILog m_log = | 44 | // private static readonly ILog m_log = |
45 | // LogManager.GetLogger( | 45 | // LogManager.GetLogger( |
46 | // MethodBase.GetCurrentMethod().DeclaringType); | 46 | // MethodBase.GetCurrentMethod().DeclaringType); |
47 | 47 | ||
48 | private static RegionsExpiringCache m_Cache; | 48 | private static RegionsExpiringCache m_Cache; |
49 | private int numberInstances; | 49 | private int numberInstances; |
50 | 50 | ||
@@ -60,12 +60,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
60 | if (rinfo != null) | 60 | if (rinfo != null) |
61 | this.Cache(rinfo.ScopeID, rinfo); | 61 | this.Cache(rinfo.ScopeID, rinfo); |
62 | } | 62 | } |
63 | 63 | ||
64 | public void Cache(UUID scopeID, GridRegion rinfo) | 64 | public void Cache(UUID scopeID, GridRegion rinfo) |
65 | { | 65 | { |
66 | if (rinfo == null) | 66 | if (rinfo == null) |
67 | return; | 67 | return; |
68 | 68 | ||
69 | m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS); | 69 | m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS); |
70 | } | 70 | } |
71 | 71 | ||
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
73 | { | 73 | { |
74 | if (rinfo == null) | 74 | if (rinfo == null) |
75 | return; | 75 | return; |
76 | 76 | ||
77 | m_Cache.AddOrUpdate(rinfo.ScopeID, rinfo, 1e7f); | 77 | m_Cache.AddOrUpdate(rinfo.ScopeID, rinfo, 1e7f); |
78 | } | 78 | } |
79 | 79 | ||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
81 | { | 81 | { |
82 | if (rinfo == null) | 82 | if (rinfo == null) |
83 | return; | 83 | return; |
84 | 84 | ||
85 | m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS); | 85 | m_Cache.AddOrUpdate(scopeID, rinfo, CACHE_EXPIRATION_SECONDS); |
86 | } | 86 | } |
87 | 87 | ||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
89 | { | 89 | { |
90 | if (rinfo == null) | 90 | if (rinfo == null) |
91 | return; | 91 | return; |
92 | 92 | ||
93 | m_Cache.AddOrUpdate(scopeID, rinfo, expireSeconds); | 93 | m_Cache.AddOrUpdate(scopeID, rinfo, expireSeconds); |
94 | } | 94 | } |
95 | 95 | ||
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
141 | inCache = true; | 141 | inCache = true; |
142 | return rinfo; | 142 | return rinfo; |
143 | } | 143 | } |
144 | 144 | ||
145 | return null; | 145 | return null; |
146 | } | 146 | } |
147 | 147 | ||
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
155 | inCache = true; | 155 | inCache = true; |
156 | return rinfo; | 156 | return rinfo; |
157 | } | 157 | } |
158 | 158 | ||
159 | return null; | 159 | return null; |
160 | } | 160 | } |
161 | } | 161 | } |
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
300 | private Dictionary<string, ulong> byname; | 300 | private Dictionary<string, ulong> byname; |
301 | private Dictionary<UUID, ulong> byuuid; | 301 | private Dictionary<UUID, ulong> byuuid; |
302 | // includes handles to the inside of large regions | 302 | // includes handles to the inside of large regions |
303 | private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>(); | 303 | private Dictionary<ulong, ulong> innerHandles = new Dictionary<ulong, ulong>(); |
304 | 304 | ||
305 | public RegionInfoForScope() | 305 | public RegionInfoForScope() |
306 | { | 306 | { |
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
342 | byuuid = new Dictionary<UUID, ulong>(); | 342 | byuuid = new Dictionary<UUID, ulong>(); |
343 | 343 | ||
344 | storage[handle] = region; | 344 | storage[handle] = region; |
345 | expires[handle] = expire; | 345 | expires[handle] = expire; |
346 | byname[region.RegionName] = handle; | 346 | byname[region.RegionName] = handle; |
347 | byuuid[region.RegionID] = handle; | 347 | byuuid[region.RegionID] = handle; |
348 | 348 | ||
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
385 | storage[handle] = region; | 385 | storage[handle] = region; |
386 | byname[region.RegionName] = handle; | 386 | byname[region.RegionName] = handle; |
387 | byuuid[region.RegionID] = handle; | 387 | byuuid[region.RegionID] = handle; |
388 | 388 | ||
389 | } | 389 | } |
390 | 390 | ||
391 | public void Remove(GridRegion region) | 391 | public void Remove(GridRegion region) |
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
483 | 483 | ||
484 | if(!innerHandles.ContainsKey(handle)) | 484 | if(!innerHandles.ContainsKey(handle)) |
485 | return null; | 485 | return null; |
486 | 486 | ||
487 | ulong rhandle = innerHandles[handle]; | 487 | ulong rhandle = innerHandles[handle]; |
488 | if(storage.ContainsKey(rhandle)) | 488 | if(storage.ContainsKey(rhandle)) |
489 | return storage[rhandle]; | 489 | return storage[rhandle]; |
@@ -495,7 +495,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
495 | { | 495 | { |
496 | if(byname == null || !byname.ContainsKey(name)) | 496 | if(byname == null || !byname.ContainsKey(name)) |
497 | return null; | 497 | return null; |
498 | 498 | ||
499 | ulong handle = byname[name]; | 499 | ulong handle = byname[name]; |
500 | if(storage.ContainsKey(handle)) | 500 | if(storage.ContainsKey(handle)) |
501 | return storage[handle]; | 501 | return storage[handle]; |
@@ -528,7 +528,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
528 | 528 | ||
529 | if(!innerHandles.ContainsKey(handle)) | 529 | if(!innerHandles.ContainsKey(handle)) |
530 | return null; | 530 | return null; |
531 | 531 | ||
532 | ulong rhandle = innerHandles[handle]; | 532 | ulong rhandle = innerHandles[handle]; |
533 | if(!storage.ContainsKey(rhandle)) | 533 | if(!storage.ContainsKey(rhandle)) |
534 | return null; | 534 | return null; |
@@ -536,7 +536,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
536 | GridRegion r = storage[rhandle]; | 536 | GridRegion r = storage[rhandle]; |
537 | if(r == null) | 537 | if(r == null) |
538 | return null; | 538 | return null; |
539 | 539 | ||
540 | // extra check, possible redundant | 540 | // extra check, possible redundant |
541 | 541 | ||
542 | int test = r.RegionLocX; | 542 | int test = r.RegionLocX; |
@@ -552,7 +552,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
552 | if (y < test) | 552 | if (y < test) |
553 | return r; | 553 | return r; |
554 | 554 | ||
555 | /* | 555 | /* |
556 | // next do the harder work | 556 | // next do the harder work |
557 | foreach(KeyValuePair<ulong, GridRegion> kvp in storage) | 557 | foreach(KeyValuePair<ulong, GridRegion> kvp in storage) |
558 | { | 558 | { |
@@ -588,7 +588,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
588 | if(kvp.Value < now) | 588 | if(kvp.Value < now) |
589 | toexpire.Add(kvp.Key); | 589 | toexpire.Add(kvp.Key); |
590 | } | 590 | } |
591 | 591 | ||
592 | if(toexpire.Count == 0) | 592 | if(toexpire.Count == 0) |
593 | return expires.Count; | 593 | return expires.Count; |
594 | 594 | ||
@@ -597,7 +597,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
597 | Clear(); | 597 | Clear(); |
598 | return 0; | 598 | return 0; |
599 | } | 599 | } |
600 | 600 | ||
601 | foreach(ulong h in toexpire) | 601 | foreach(ulong h in toexpire) |
602 | { | 602 | { |
603 | if(storage != null) | 603 | if(storage != null) |
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
658 | innerHandles[fh.toHandle()] = handle; | 658 | innerHandles[fh.toHandle()] = handle; |
659 | fh.y += 256; | 659 | fh.y += 256; |
660 | } | 660 | } |
661 | 661 | ||
662 | fh.y = startY; | 662 | fh.y = startY; |
663 | fh.x += 256; | 663 | fh.x += 256; |
664 | } | 664 | } |
@@ -684,18 +684,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
684 | innerHandles.Remove(fh.toHandle()); | 684 | innerHandles.Remove(fh.toHandle()); |
685 | fh.y += 256; | 685 | fh.y += 256; |
686 | } | 686 | } |
687 | 687 | ||
688 | fh.y = startY; | 688 | fh.y = startY; |
689 | fh.x += 256; | 689 | fh.x += 256; |
690 | } | 690 | } |
691 | } | 691 | } |
692 | } | 692 | } |
693 | 693 | ||
694 | public class RegionsExpiringCache | 694 | public class RegionsExpiringCache |
695 | { | 695 | { |
696 | const double CACHE_PURGE_HZ = 60; // seconds | 696 | const double CACHE_PURGE_HZ = 60; // seconds |
697 | const int MAX_LOCK_WAIT = 10000; // milliseconds | 697 | const int MAX_LOCK_WAIT = 10000; // milliseconds |
698 | 698 | ||
699 | /// <summary>For thread safety</summary> | 699 | /// <summary>For thread safety</summary> |
700 | object syncRoot = new object(); | 700 | object syncRoot = new object(); |
701 | /// <summary>For thread safety</summary> | 701 | /// <summary>For thread safety</summary> |
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
728 | ris = new RegionInfoForScope(region, expire); | 728 | ris = new RegionInfoForScope(region, expire); |
729 | InfobyScope[scope] = ris; | 729 | InfobyScope[scope] = ris; |
730 | } | 730 | } |
731 | else | 731 | else |
732 | ris.AddUpdate(region, expire); | 732 | ris.AddUpdate(region, expire); |
733 | 733 | ||
734 | return true; | 734 | return true; |
@@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
748 | } | 748 | } |
749 | finally { Monitor.Exit(syncRoot); } | 749 | finally { Monitor.Exit(syncRoot); } |
750 | } | 750 | } |
751 | 751 | ||
752 | public bool Contains(UUID scope, GridRegion region) | 752 | public bool Contains(UUID scope, GridRegion region) |
753 | { | 753 | { |
754 | if(region == null) | 754 | if(region == null) |
@@ -758,11 +758,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
758 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); | 758 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); |
759 | 759 | ||
760 | try | 760 | try |
761 | { | 761 | { |
762 | RegionInfoForScope ris = null; | 762 | RegionInfoForScope ris = null; |
763 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) | 763 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) |
764 | return false; | 764 | return false; |
765 | 765 | ||
766 | return ris.Contains(region); | 766 | return ris.Contains(region); |
767 | } | 767 | } |
768 | finally { Monitor.Exit(syncRoot); } | 768 | finally { Monitor.Exit(syncRoot); } |
@@ -774,11 +774,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
774 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); | 774 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); |
775 | 775 | ||
776 | try | 776 | try |
777 | { | 777 | { |
778 | RegionInfoForScope ris = null; | 778 | RegionInfoForScope ris = null; |
779 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) | 779 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) |
780 | return false; | 780 | return false; |
781 | 781 | ||
782 | return ris.Contains(handle); | 782 | return ris.Contains(handle); |
783 | } | 783 | } |
784 | finally { Monitor.Exit(syncRoot); } | 784 | finally { Monitor.Exit(syncRoot); } |
@@ -790,7 +790,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
790 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); | 790 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); |
791 | 791 | ||
792 | try | 792 | try |
793 | { | 793 | { |
794 | int count = 0; | 794 | int count = 0; |
795 | foreach(RegionInfoForScope ris in InfobyScope.Values) | 795 | foreach(RegionInfoForScope ris in InfobyScope.Values) |
796 | count += ris.Count(); | 796 | count += ris.Count(); |
@@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
804 | if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT)) | 804 | if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT)) |
805 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); | 805 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); |
806 | try | 806 | try |
807 | { | 807 | { |
808 | RegionInfoForScope ris = null; | 808 | RegionInfoForScope ris = null; |
809 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) | 809 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) |
810 | return false; | 810 | return false; |
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
825 | if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT)) | 825 | if (!Monitor.TryEnter(syncRoot, MAX_LOCK_WAIT)) |
826 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); | 826 | throw new ApplicationException("Lock could not be acquired after " + MAX_LOCK_WAIT + "ms"); |
827 | try | 827 | try |
828 | { | 828 | { |
829 | RegionInfoForScope ris = null; | 829 | RegionInfoForScope ris = null; |
830 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) | 830 | if(!InfobyScope.TryGetValue(scope, out ris) || ris == null) |
831 | return false; | 831 | return false; |
@@ -940,7 +940,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
940 | private void PurgeCache(object sender, System.Timers.ElapsedEventArgs e) | 940 | private void PurgeCache(object sender, System.Timers.ElapsedEventArgs e) |
941 | { | 941 | { |
942 | // Only let one thread purge at once - a buildup could cause a crash | 942 | // Only let one thread purge at once - a buildup could cause a crash |
943 | // This could cause the purge to be delayed while there are lots of read/write ops | 943 | // This could cause the purge to be delayed while there are lots of read/write ops |
944 | // happening on the cache | 944 | // happening on the cache |
945 | if (!Monitor.TryEnter(isPurging)) | 945 | if (!Monitor.TryEnter(isPurging)) |
946 | return; | 946 | return; |
@@ -961,7 +961,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
961 | if (kvp.Value.expire(now) == 0) | 961 | if (kvp.Value.expire(now) == 0) |
962 | expiredscopes.Add(kvp.Key); | 962 | expiredscopes.Add(kvp.Key); |
963 | } | 963 | } |
964 | 964 | ||
965 | if (expiredscopes.Count > 0) | 965 | if (expiredscopes.Count > 0) |
966 | { | 966 | { |
967 | foreach (UUID sid in expiredscopes) | 967 | foreach (UUID sid in expiredscopes) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 50e4c8a..ee17093 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
58 | private IGridService m_RemoteGridService; | 58 | private IGridService m_RemoteGridService; |
59 | 59 | ||
60 | private RegionInfoCache m_RegionInfoCache; | 60 | private RegionInfoCache m_RegionInfoCache; |
61 | 61 | ||
62 | public RemoteGridServicesConnector() | 62 | public RemoteGridServicesConnector() |
63 | { | 63 | { |
64 | } | 64 | } |
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
70 | 70 | ||
71 | #region ISharedRegionmodule | 71 | #region ISharedRegionmodule |
72 | 72 | ||
73 | public Type ReplaceableInterface | 73 | public Type ReplaceableInterface |
74 | { | 74 | { |
75 | get { return null; } | 75 | get { return null; } |
76 | } | 76 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
113 | return false; | 113 | return false; |
114 | } | 114 | } |
115 | 115 | ||
116 | Object[] args = new Object[] { source }; | 116 | Object[] args = new Object[] { source }; |
117 | m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args); | 117 | m_RemoteGridService = ServerUtils.LoadPlugin<IGridService>(networkConnector, args); |
118 | 118 | ||
119 | m_LocalGridService = new LocalGridServicesConnector(source, m_RegionInfoCache); | 119 | m_LocalGridService = new LocalGridServicesConnector(source, m_RegionInfoCache); |
@@ -130,11 +130,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
130 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 130 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |
131 | // Legacy. Remove soon! | 131 | // Legacy. Remove soon! |
132 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); | 132 | m_ThisGatekeeper = gridConfig.GetString("Gatekeeper", m_ThisGatekeeper); |
133 | 133 | ||
134 | Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); | 134 | Util.checkServiceURI(m_ThisGatekeeper, out m_ThisGatekeeper); |
135 | 135 | ||
136 | return true; | 136 | return true; |
137 | } | 137 | } |
138 | 138 | ||
139 | public void PostInitialise() | 139 | public void PostInitialise() |
140 | { | 140 | { |
@@ -249,14 +249,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
249 | { | 249 | { |
250 | if(string.IsNullOrWhiteSpace(m_ThisGatekeeper)) | 250 | if(string.IsNullOrWhiteSpace(m_ThisGatekeeper)) |
251 | return rinfo; // no HG | 251 | return rinfo; // no HG |
252 | 252 | ||
253 | string regionURI = ""; | 253 | string regionURI = ""; |
254 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName)) | 254 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName)) |
255 | return rinfo; // invalid | 255 | return rinfo; // invalid |
256 | if(m_ThisGatekeeper != regionURI) | 256 | if(m_ThisGatekeeper != regionURI) |
257 | return rinfo; // not local grid | 257 | return rinfo; // not local grid |
258 | } | 258 | } |
259 | 259 | ||
260 | rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName); | 260 | rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName); |
261 | m_RegionInfoCache.Cache(scopeID, rinfo); | 261 | m_RegionInfoCache.Cache(scopeID, rinfo); |
262 | return rinfo; | 262 | return rinfo; |
@@ -275,10 +275,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
275 | { | 275 | { |
276 | if(string.IsNullOrWhiteSpace(m_ThisGatekeeper)) | 276 | if(string.IsNullOrWhiteSpace(m_ThisGatekeeper)) |
277 | return rinfo; // no HG | 277 | return rinfo; // no HG |
278 | 278 | ||
279 | string regionURI = ""; | 279 | string regionURI = ""; |
280 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName)) | 280 | if(!Util.buildHGRegionURI(name, out regionURI, out regionName) || string.IsNullOrWhiteSpace(regionName)) |
281 | return rinfo; // invalid | 281 | return rinfo; // invalid |
282 | if(m_ThisGatekeeper != regionURI) | 282 | if(m_ThisGatekeeper != regionURI) |
283 | return rinfo; // not local grid | 283 | return rinfo; // not local grid |
284 | } | 284 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index 044e0e5..1378368 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests | |||
88 | Scene s = new Scene(new RegionInfo()); | 88 | Scene s = new Scene(new RegionInfo()); |
89 | s.RegionInfo.RegionID = r1.RegionID; | 89 | s.RegionInfo.RegionID = r1.RegionID; |
90 | m_LocalConnector.AddRegion(s); | 90 | m_LocalConnector.AddRegion(s); |
91 | 91 | ||
92 | GridRegion r2 = new GridRegion(); | 92 | GridRegion r2 = new GridRegion(); |
93 | r2.RegionName = "Test Region 2"; | 93 | r2.RegionName = "Test Region 2"; |
94 | r2.RegionID = new UUID(2); | 94 | r2.RegionID = new UUID(2); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs index 98ccc95..c780bcd 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs | |||
@@ -37,7 +37,7 @@ using log4net; | |||
37 | 37 | ||
38 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | 38 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser |
39 | { | 39 | { |
40 | public class ActivityDetector | 40 | public class ActivityDetector |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser | |||
67 | { | 67 | { |
68 | if (sp.isNPC) | 68 | if (sp.isNPC) |
69 | return; | 69 | return; |
70 | 70 | ||
71 | if(sp.gotCrossUpdate) | 71 | if(sp.gotCrossUpdate) |
72 | { | 72 | { |
73 | Util.FireAndForget(delegate | 73 | Util.FireAndForget(delegate |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index c48186f..5efdd9b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | public Type ReplaceableInterface | 89 | public Type ReplaceableInterface |
90 | { | 90 | { |
91 | get { return null; } | 91 | get { return null; } |
92 | } | 92 | } |
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
299 | return m_InventoryURLs[userID]; | 299 | return m_InventoryURLs[userID]; |
300 | 300 | ||
301 | return null; //it means that the methods should forward to local grid's inventory | 301 | return null; //it means that the methods should forward to local grid's inventory |
302 | 302 | ||
303 | } | 303 | } |
304 | #endregion | 304 | #endregion |
305 | 305 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index 0d36725..fa36b66 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
72 | 72 | ||
73 | private bool m_Enabled = false; | 73 | private bool m_Enabled = false; |
74 | 74 | ||
75 | public Type ReplaceableInterface | 75 | public Type ReplaceableInterface |
76 | { | 76 | { |
77 | get { return null; } | 77 | get { return null; } |
78 | } | 78 | } |
@@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
134 | { | 134 | { |
135 | if (!m_Enabled) | 135 | if (!m_Enabled) |
136 | return; | 136 | return; |
137 | 137 | ||
138 | scene.RegisterModuleInterface<IInventoryService>(this); | 138 | scene.RegisterModuleInterface<IInventoryService>(this); |
139 | 139 | ||
140 | if (Scene == null) | 140 | if (Scene == null) |
@@ -261,9 +261,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
261 | public bool AddItem(InventoryItemBase item) | 261 | public bool AddItem(InventoryItemBase item) |
262 | { | 262 | { |
263 | // m_log.DebugFormat( | 263 | // m_log.DebugFormat( |
264 | // "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", | 264 | // "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}", |
265 | // item.Name, item.Owner, item.Folder); | 265 | // item.Name, item.Owner, item.Folder); |
266 | 266 | ||
267 | return m_InventoryService.AddItem(item); | 267 | return m_InventoryService.AddItem(item); |
268 | } | 268 | } |
269 | 269 | ||
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
297 | // m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); | 297 | // m_log.DebugFormat("[LOCAL INVENTORY SERVICES CONNECTOR]: Requesting inventory item {0}", item.ID); |
298 | 298 | ||
299 | // UUID requestedItemId = item.ID; | 299 | // UUID requestedItemId = item.ID; |
300 | 300 | ||
301 | InventoryItemBase item = m_InventoryService.GetItem(principalID, itemID); | 301 | InventoryItemBase item = m_InventoryService.GetItem(principalID, itemID); |
302 | 302 | ||
303 | // if (null == item) | 303 | // if (null == item) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs index 62b44b1..d8ae2c4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
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 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs index 9e251aa..cad2061 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/LocalLandServiceConnector.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | |||
62 | 62 | ||
63 | #region ISharedRegionModule | 63 | #region ISharedRegionModule |
64 | 64 | ||
65 | public Type ReplaceableInterface | 65 | public Type ReplaceableInterface |
66 | { | 66 | { |
67 | get { return null; } | 67 | get { return null; } |
68 | } | 68 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs index 77dfa4a..68c5b64 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land | |||
53 | private bool m_Enabled = false; | 53 | private bool m_Enabled = false; |
54 | private LocalLandServicesConnector m_LocalService; | 54 | private LocalLandServicesConnector m_LocalService; |
55 | 55 | ||
56 | public Type ReplaceableInterface | 56 | public Type ReplaceableInterface |
57 | { | 57 | { |
58 | get { return null; } | 58 | get { return null; } |
59 | } | 59 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index 1357825..9888c3b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | |||
@@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
68 | private int m_refreshtime = 0; | 68 | private int m_refreshtime = 0; |
69 | private int m_lastrefresh = 0; | 69 | private int m_lastrefresh = 0; |
70 | private System.Timers.Timer m_refreshTimer; | 70 | private System.Timers.Timer m_refreshTimer; |
71 | 71 | ||
72 | #region ISharedRegionModule | 72 | #region ISharedRegionModule |
73 | 73 | ||
74 | public Type ReplaceableInterface { get { return null; } } | 74 | public Type ReplaceableInterface { get { return null; } } |
75 | public string Name { get { return "MapImageServiceModule"; } } | 75 | public string Name { get { return "MapImageServiceModule"; } } |
76 | public void RegionLoaded(Scene scene) { } | 76 | public void RegionLoaded(Scene scene) { } |
77 | public void Close() { } | 77 | public void Close() { } |
78 | public void PostInitialise() { } | 78 | public void PostInitialise() { } |
@@ -115,12 +115,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
115 | m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service); | 115 | m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service); |
116 | return; | 116 | return; |
117 | } | 117 | } |
118 | 118 | ||
119 | // we don't want the timer if the interval is zero, but we still want this module enables | 119 | // we don't want the timer if the interval is zero, but we still want this module enables |
120 | if(refreshminutes > 0) | 120 | if(refreshminutes > 0) |
121 | { | 121 | { |
122 | m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms | 122 | m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms |
123 | 123 | ||
124 | m_refreshTimer = new System.Timers.Timer(); | 124 | m_refreshTimer = new System.Timers.Timer(); |
125 | m_refreshTimer.Enabled = true; | 125 | m_refreshTimer.Enabled = true; |
126 | m_refreshTimer.AutoReset = true; | 126 | m_refreshTimer.AutoReset = true; |
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
131 | m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}", | 131 | m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0} min and service object {1}", |
132 | refreshminutes, service); | 132 | refreshminutes, service); |
133 | } | 133 | } |
134 | else | 134 | else |
135 | { | 135 | { |
136 | m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with no refresh and service object {0}", service); | 136 | m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with no refresh and service object {0}", service); |
137 | } | 137 | } |
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
171 | } | 171 | } |
172 | 172 | ||
173 | #endregion ISharedRegionModule | 173 | #endregion ISharedRegionModule |
174 | 174 | ||
175 | ///<summary> | 175 | ///<summary> |
176 | /// | 176 | /// |
177 | ///</summary> | 177 | ///</summary> |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index bda354f..e8d01b0 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
63 | 63 | ||
64 | #region ISharedRegionModule | 64 | #region ISharedRegionModule |
65 | 65 | ||
66 | public Type ReplaceableInterface | 66 | public Type ReplaceableInterface |
67 | { | 67 | { |
68 | get { return null; } | 68 | get { return null; } |
69 | } | 69 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
113 | 113 | ||
114 | public void RemoveRegion(Scene scene) | 114 | public void RemoveRegion(Scene scene) |
115 | { | 115 | { |
116 | // Always remove | 116 | // Always remove |
117 | if (m_Scenes.Contains(scene)) | 117 | if (m_Scenes.Contains(scene)) |
118 | m_Scenes.Remove(scene); | 118 | m_Scenes.Remove(scene); |
119 | } | 119 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index e6772f3..fcb5521 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
53 | //private string serviceDll; | 53 | //private string serviceDll; |
54 | //private List<Scene> m_Scenes = new List<Scene>(); | 54 | //private List<Scene> m_Scenes = new List<Scene>(); |
55 | 55 | ||
56 | public Type ReplaceableInterface | 56 | public Type ReplaceableInterface |
57 | { | 57 | { |
58 | get { return null; } | 58 | get { return null; } |
59 | } | 59 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs index 117f02c..aafd047 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Services.Interfaces; | |||
35 | 35 | ||
36 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | 36 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence |
37 | { | 37 | { |
38 | public class PresenceDetector | 38 | public class PresenceDetector |
39 | { | 39 | { |
40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 40 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
41 | 41 | ||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence | |||
70 | { | 70 | { |
71 | if (sp.isNPC) | 71 | if (sp.isNPC) |
72 | return; | 72 | return; |
73 | 73 | ||
74 | if(sp.gotCrossUpdate) | 74 | if(sp.gotCrossUpdate) |
75 | { | 75 | { |
76 | Util.FireAndForget(delegate | 76 | Util.FireAndForget(delegate |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs index 69bac82..7838d12 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests | |||
72 | public void TestPresenceV0_1() | 72 | public void TestPresenceV0_1() |
73 | { | 73 | { |
74 | SetUp(); | 74 | SetUp(); |
75 | 75 | ||
76 | // Let's stick in a test presence | 76 | // Let's stick in a test presence |
77 | /* | 77 | /* |
78 | PresenceData p = new PresenceData(); | 78 | PresenceData p = new PresenceData(); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs index 3755650..57aba05 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
219 | } | 219 | } |
220 | 220 | ||
221 | // m_log.DebugFormat( | 221 | // m_log.DebugFormat( |
222 | // "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate", | 222 | // "[LOCAL COMMS]: Did not find region {0} {1} for ChildAgentUpdate", |
223 | // destination.RegionName, destination.RegionID); | 223 | // destination.RegionName, destination.RegionID); |
224 | 224 | ||
225 | return false; | 225 | return false; |
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
265 | reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading."; | 265 | reason = "Destination is a variable-sized region, and source is an old simulator. Consider upgrading."; |
266 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied"); | 266 | m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Request to access this variable-sized region from older simulator was denied"); |
267 | return false; | 267 | return false; |
268 | 268 | ||
269 | } | 269 | } |
270 | 270 | ||
271 | 271 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs index 0ebdbce..b402d2a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs | |||
@@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
137 | } | 137 | } |
138 | 138 | ||
139 | protected virtual void InitOnce(Scene scene) | 139 | protected virtual void InitOnce(Scene scene) |
140 | { | 140 | { |
141 | m_aScene = scene; | 141 | m_aScene = scene; |
142 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); | 142 | //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); |
143 | } | 143 | } |
@@ -248,7 +248,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation | |||
248 | // else do the remote thing | 248 | // else do the remote thing |
249 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) | 249 | if (!m_localBackend.IsLocalRegion(destination.RegionID)) |
250 | return m_remoteConnector.CloseAgent(destination, id, auth_token); | 250 | return m_remoteConnector.CloseAgent(destination, id, auth_token); |
251 | 251 | ||
252 | return false; | 252 | return false; |
253 | } | 253 | } |
254 | 254 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs index b72ffbb..77fd70b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
59 | 59 | ||
60 | #region ISharedRegionModule | 60 | #region ISharedRegionModule |
61 | 61 | ||
62 | public Type ReplaceableInterface | 62 | public Type ReplaceableInterface |
63 | { | 63 | { |
64 | get { return null; } | 64 | get { return null; } |
65 | } | 65 | } |
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
200 | account = m_Cache.Get(uuid, out inCache); | 200 | account = m_Cache.Get(uuid, out inCache); |
201 | if (inCache) | 201 | if (inCache) |
202 | ret.Add(account); | 202 | ret.Add(account); |
203 | else | 203 | else |
204 | missing.Add(id); | 204 | missing.Add(id); |
205 | } | 205 | } |
206 | } | 206 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs index f5eda11..b510d0a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
53 | private bool m_Enabled = false; | 53 | private bool m_Enabled = false; |
54 | private UserAccountCache m_Cache; | 54 | private UserAccountCache m_Cache; |
55 | 55 | ||
56 | public Type ReplaceableInterface | 56 | public Type ReplaceableInterface |
57 | { | 57 | { |
58 | get { return null; } | 58 | get { return null; } |
59 | } | 59 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs index 2afd74e..f3572a2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
43 | // private static readonly ILog m_log = | 43 | // private static readonly ILog m_log = |
44 | // LogManager.GetLogger( | 44 | // LogManager.GetLogger( |
45 | // MethodBase.GetCurrentMethod().DeclaringType); | 45 | // MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 47 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
48 | private ExpiringCache<string, UUID> m_NameCache; | 48 | private ExpiringCache<string, UUID> m_NameCache; |
49 | private object accessLock = new object(); | 49 | private object accessLock = new object(); |
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
51 | public UserAccountCache() | 51 | public UserAccountCache() |
52 | { | 52 | { |
53 | m_UUIDCache = new ExpiringCache<UUID, UserAccount>(); | 53 | m_UUIDCache = new ExpiringCache<UUID, UserAccount>(); |
54 | m_NameCache = new ExpiringCache<string, UUID>(); | 54 | m_NameCache = new ExpiringCache<string, UUID>(); |
55 | } | 55 | } |
56 | 56 | ||
57 | public void Cache(UUID userID, UserAccount account) | 57 | public void Cache(UUID userID, UserAccount account) |
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts | |||
70 | { | 70 | { |
71 | m_UUIDCache.AddOrUpdate(userID, account, CACHE_ALIEN_EXPIRATION_SECONDS); | 71 | m_UUIDCache.AddOrUpdate(userID, account, CACHE_ALIEN_EXPIRATION_SECONDS); |
72 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_ALIEN_EXPIRATION_SECONDS); | 72 | m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, CACHE_ALIEN_EXPIRATION_SECONDS); |
73 | } | 73 | } |
74 | //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); | 74 | //m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); |
75 | } | 75 | } |
76 | } | 76 | } |