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/Grid/RemoteGridServiceConnector.cs | |
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/Grid/RemoteGridServiceConnector.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 22 |
1 files changed, 11 insertions, 11 deletions
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 | } |