diff options
author | Jeff Ames | 2009-06-10 04:28:56 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-10 04:28:56 +0000 |
commit | a23d64dec1cbf88abc3c7e84664a683dee534e4a (patch) | |
tree | 7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/CoreModules | |
parent | Letting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff) | |
download | opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2 opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/CoreModules')
5 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index d09f5ef..35713ad 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -231,7 +231,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
231 | 231 | ||
232 | private void UpdateMemoryCache(string key, AssetBase asset) | 232 | private void UpdateMemoryCache(string key, AssetBase asset) |
233 | { | 233 | { |
234 | if( m_MemoryCacheEnabled ) | 234 | if (m_MemoryCacheEnabled) |
235 | { | 235 | { |
236 | if (m_MemoryExpiration > TimeSpan.Zero) | 236 | if (m_MemoryExpiration > TimeSpan.Zero) |
237 | { | 237 | { |
@@ -405,7 +405,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
405 | File.Delete(filename); | 405 | File.Delete(filename); |
406 | } | 406 | } |
407 | 407 | ||
408 | if( m_MemoryCacheEnabled ) | 408 | if (m_MemoryCacheEnabled) |
409 | m_MemoryCache.Remove(id); | 409 | m_MemoryCache.Remove(id); |
410 | } | 410 | } |
411 | catch (Exception e) | 411 | catch (Exception e) |
@@ -424,7 +424,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
424 | Directory.Delete(dir); | 424 | Directory.Delete(dir); |
425 | } | 425 | } |
426 | 426 | ||
427 | if( m_MemoryCacheEnabled ) | 427 | if (m_MemoryCacheEnabled) |
428 | m_MemoryCache.Clear(); | 428 | m_MemoryCache.Clear(); |
429 | } | 429 | } |
430 | 430 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 8cc2655..66f1e14 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
116 | { | 116 | { |
117 | byte dialog = im.dialog; | 117 | byte dialog = im.dialog; |
118 | 118 | ||
119 | if ( dialog != (byte)InstantMessageDialog.MessageFromAgent | 119 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent |
120 | && dialog != (byte)InstantMessageDialog.StartTyping | 120 | && dialog != (byte)InstantMessageDialog.StartTyping |
121 | && dialog != (byte)InstantMessageDialog.StopTyping | 121 | && dialog != (byte)InstantMessageDialog.StopTyping |
122 | && dialog != (byte)InstantMessageDialog.MessageFromObject) | 122 | && dialog != (byte)InstantMessageDialog.MessageFromObject) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 986f604..12f5d19 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
219 | else | 219 | else |
220 | { | 220 | { |
221 | if (m_TransferModule != null) | 221 | if (m_TransferModule != null) |
222 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 222 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
223 | } | 223 | } |
224 | } | 224 | } |
225 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) | 225 | else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) |
@@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
233 | else | 233 | else |
234 | { | 234 | { |
235 | if (m_TransferModule != null) | 235 | if (m_TransferModule != null) |
236 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 236 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
237 | } | 237 | } |
238 | } | 238 | } |
239 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | 239 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) |
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
300 | else | 300 | else |
301 | { | 301 | { |
302 | if (m_TransferModule != null) | 302 | if (m_TransferModule != null) |
303 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); | 303 | m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | } | 306 | } |
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index da43ce8..b8cc308 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |||
@@ -890,8 +890,8 @@ namespace OpenSim.Region.CoreModules.InterGrid | |||
890 | 890 | ||
891 | responseMap["sim_host"] = OSD.FromString(rezRespSim_host); | 891 | responseMap["sim_host"] = OSD.FromString(rezRespSim_host); |
892 | responseMap["sim_port"] = OSD.FromInteger(rrPort); | 892 | responseMap["sim_port"] = OSD.FromInteger(rrPort); |
893 | responseMap["region_x"] = OSD.FromInteger(rrX ); | 893 | responseMap["region_x"] = OSD.FromInteger(rrX); |
894 | responseMap["region_y"] = OSD.FromInteger(rrY ); | 894 | responseMap["region_y"] = OSD.FromInteger(rrY); |
895 | responseMap["region_id"] = OSD.FromUUID(rrRID); | 895 | responseMap["region_id"] = OSD.FromUUID(rrRID); |
896 | responseMap["sim_access"] = OSD.FromString(rrAccess); | 896 | responseMap["sim_access"] = OSD.FromString(rrAccess); |
897 | 897 | ||
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs index 99a294d..7afada3 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | |||
@@ -511,7 +511,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
511 | if (z_sort.ContainsKey(sortedlocalIds[s])) | 511 | if (z_sort.ContainsKey(sortedlocalIds[s])) |
512 | { | 512 | { |
513 | DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; | 513 | DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; |
514 | for (int r = 0; r < rectDrawStruct.trns.Length; r++ ) | 514 | for (int r = 0; r < rectDrawStruct.trns.Length; r++) |
515 | { | 515 | { |
516 | g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); | 516 | g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); |
517 | } | 517 | } |