From a23d64dec1cbf88abc3c7e84664a683dee534e4a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 10 Jun 2009 04:28:56 +0000 Subject: Formatting cleanup. --- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 +++--- .../CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 2 +- .../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 6 +++--- OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 4 ++-- OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'OpenSim/Region/CoreModules') 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 private void UpdateMemoryCache(string key, AssetBase asset) { - if( m_MemoryCacheEnabled ) + if (m_MemoryCacheEnabled) { if (m_MemoryExpiration > TimeSpan.Zero) { @@ -405,7 +405,7 @@ namespace Flotsam.RegionModules.AssetCache File.Delete(filename); } - if( m_MemoryCacheEnabled ) + if (m_MemoryCacheEnabled) m_MemoryCache.Remove(id); } catch (Exception e) @@ -424,7 +424,7 @@ namespace Flotsam.RegionModules.AssetCache Directory.Delete(dir); } - if( m_MemoryCacheEnabled ) + if (m_MemoryCacheEnabled) m_MemoryCache.Clear(); } 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 { byte dialog = im.dialog; - if ( dialog != (byte)InstantMessageDialog.MessageFromAgent + if (dialog != (byte)InstantMessageDialog.MessageFromAgent && dialog != (byte)InstantMessageDialog.StartTyping && dialog != (byte)InstantMessageDialog.StopTyping && 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 else { if (m_TransferModule != null) - m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); } } else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) @@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer else { if (m_TransferModule != null) - m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); } } else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) @@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer else { if (m_TransferModule != null) - m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(im, delegate(bool success) {}); } } } 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 responseMap["sim_host"] = OSD.FromString(rezRespSim_host); responseMap["sim_port"] = OSD.FromInteger(rrPort); - responseMap["region_x"] = OSD.FromInteger(rrX ); - responseMap["region_y"] = OSD.FromInteger(rrY ); + responseMap["region_x"] = OSD.FromInteger(rrX); + responseMap["region_y"] = OSD.FromInteger(rrY); responseMap["region_id"] = OSD.FromUUID(rrRID); responseMap["sim_access"] = OSD.FromString(rrAccess); 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 if (z_sort.ContainsKey(sortedlocalIds[s])) { DrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]]; - for (int r = 0; r < rectDrawStruct.trns.Length; r++ ) + for (int r = 0; r < rectDrawStruct.trns.Length; r++) { g.FillPolygon(rectDrawStruct.brush,rectDrawStruct.trns[r].pts); } -- cgit v1.1