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/Asset/HGAssetBroker.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/Asset/HGAssetBroker.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs | 20 |
1 files changed, 10 insertions, 10 deletions
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 | ||