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/Application/OpenSimBase.cs | 2 +- OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 ++-- .../Region/Communications/Hypergrid/HGGridServices.cs | 2 +- .../Communications/Local/LocalInventoryService.cs | 2 +- .../Region/Communications/OGS1/OGS1GridServices.cs | 2 +- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 +++--- .../Avatar/InstantMessage/InstantMessageModule.cs | 2 +- .../Inventory/Transfer/InventoryTransferModule.cs | 6 +++--- .../CoreModules/InterGrid/OpenGridProtocolModule.cs | 4 ++-- .../CoreModules/World/WorldMap/MapImageModule.cs | 2 +- OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | 4 ++-- OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 +- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++-- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- .../Framework/Scenes/Tests/EntityManagerTests.cs | 8 ++++---- .../OptionalModules/Avatar/Chat/ChannelState.cs | 6 +++--- .../Voice/FreeSwitchVoice/FreeSwitchDirectory.cs | 10 +++++----- .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 2 +- .../Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | 2 +- .../ContentManagementSystem/CMModel.cs | 2 +- .../ContentManagementSystem/FileSystemDatabase.cs | 6 +++--- .../OptionalModules/Scripting/Minimodule/SOPObject.cs | 2 +- .../Physics/BulletDotNETPlugin/BulletDotNETScene.cs | 2 +- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 +--- OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 ++-- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 ++-- .../Region/Physics/OdePlugin/ODEVehicleSettings.cs | 4 ++-- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 +- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 10 +++++----- .../Shared/Api/Implementation/OSSL_Api.cs | 2 +- .../ScriptEngine/Shared/Api/Runtime/Executor.cs | 2 +- .../ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs | 4 ++-- .../ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | 12 ++++++------ .../Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 2 +- .../Shared/CodeTools/LSL2CSCodeTransformer.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 +- OpenSim/Region/UserStatistics/HTMLUtil.cs | 19 +++++++++++-------- OpenSim/Region/UserStatistics/LogLinesAJAX.cs | 2 +- OpenSim/Region/UserStatistics/WebStatsModule.cs | 2 +- 39 files changed, 81 insertions(+), 80 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a1d4b31..1ff53c9 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs @@ -391,7 +391,7 @@ namespace OpenSim scene.LoadPrimsFromStorage(regionInfo.originRegionID); // TODO : Try setting resource for region xstats here on scene - scene.CommsManager.HttpServer.AddStreamHandler( new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); + scene.CommsManager.HttpServer.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); try { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index ac5b27e..7d4bb8e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -9453,7 +9453,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP } // in the end, we dereference this, so we have to check if it's null - if (m_imageManager != null ) + if (m_imageManager != null) m_imageManager.ProcessImageQueue(10); PacketPool.Instance.ReturnPacket(Pack); } @@ -10164,7 +10164,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP mirplk.AgentData.AgentID = AgentId; mirplk.RequestData.ItemType = mapitemtype; mirplk.Data = new MapItemReplyPacket.DataBlock[replies.Length]; - for (int i = 0; i < replies.Length; i++ ) + for (int i = 0; i < replies.Length; i++) { MapItemReplyPacket.DataBlock mrdata = new MapItemReplyPacket.DataBlock(); mrdata.X = replies[i].x; diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index f30b9f7..58711e5 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs @@ -133,7 +133,7 @@ namespace OpenSim.Region.Communications.Hypergrid { // Region doesn't exist here. Trying to link remote region - m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort ); + m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort); regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random(); if (!regionInfo.RegionID.Equals(UUID.Zero)) { diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs index bb4ee33..3712fb9 100644 --- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs +++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local } else { - m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); + m_log.WarnFormat("[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); } callback(folders, items); diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 7990c9b..f82a6a1 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1 // string externalUri = (string) responseData["sim_uri"]; //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); - regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI ); + regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI); if (m_useRemoteRegionCache) { 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); } diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index d26385d..7c02f9a 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs @@ -63,7 +63,7 @@ namespace OpenSim.Region.Framework.Scenes //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info ) + public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info) { regionInfo = region_info; osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret); @@ -95,7 +95,7 @@ namespace OpenSim.Region.Framework.Scenes private string Report() { OSDMap args = new OSDMap(30); - //int time = Util.ToUnixTime( DateTime.Now ); + //int time = Util.ToUnixTime(DateTime.Now); args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); args["TimeZoneName"] = OSD.FromString(localZone); args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours); diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 72ed646..0019b23 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -645,7 +645,7 @@ namespace OpenSim.Region.Framework.Scenes public IJ2KDecoder j2kdecode; private System.Threading.Thread thisthread; - public void run( object o) + public void run(object o) { for (int i=0;i\r\n" + "\r\n" + "
\r\n" + @@ -184,7 +184,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice response["content_type"] = "text/xml"; response["keepalive"] = false; response["int_response_code"] = 200; - response["str_response_string"] = String.Format( + response["str_response_string"] = String.Format( "\r\n" + "\r\n" + "
\r\n" + @@ -230,7 +230,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice response["content_type"] = "text/xml"; response["keepalive"] = false; response["int_response_code"] = 200; - response["str_response_string"] = String.Format( + response["str_response_string"] = String.Format( "\r\n" + "\r\n" + "
\r\n" + @@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice response["content_type"] = "text/xml"; response["keepalive"] = false; response["int_response_code"] = 200; - response["str_response_string"] = String.Format( + response["str_response_string"] = String.Format( "\r\n" + "\r\n" + "
\r\n" + @@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice // response["content_type"] = "text/xml"; // response["keepalive"] = false; // response["int_response_code"] = 200; -// response["str_response_string"] = String.Format( +// response["str_response_string"] = String.Format( // "\r\n" + // "\r\n" + // "
\r\n" + diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 84d7c4c..de78f5f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs @@ -556,7 +556,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice response["content_type"] = "text/xml"; response["keepalive"] = false; - response["str_response_string"] = String.Format( + response["str_response_string"] = String.Format( "\r\n" + "\r\n"+ "{0}\r\n" + diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs index 5d8760f..bc421c2 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs @@ -1234,7 +1234,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups // UDP version doesn't seem to behave nicely. But we're going to send it out here // with an empty group membership to hopefully remove groups being displayed due // to the core Groups Stub - remoteClient.SendGroupMembership( new GroupMembershipData[0] ); + remoteClient.SendGroupMembership(new GroupMembershipData[0]); GroupMembershipData[] membershipData = m_groupData.GetAgentGroupMemberships(GetClientGroupRequestID(remoteClient), dataForAgentID).ToArray(); diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 582dc0f..52c4e03 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement { m_log.Debug("[CONTENT MANAG] saving " + scene.RegionInfo.RegionName + " with log message: " + logMessage + " length of message: " + logMessage.Length); m_database.SaveRegion(scene.RegionInfo.RegionID, scene.RegionInfo.RegionName, logMessage); - m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName ); + m_log.Debug("[CONTENT MANAG] the region name we are dealing with heeeeeeeere: " + scene.RegionInfo.RegionName); } public void DeleteAllMetaObjects() diff --git a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs index 9a91fbf..a3d7977 100644 --- a/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs @@ -123,7 +123,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement { String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + "heightmap.r32"; - FileStream fs = new FileStream( filename, FileMode.Open); + FileStream fs = new FileStream(filename, FileMode.Open); StreamReader sr = new StreamReader(fs); String result = sr.ReadToEnd(); sr.Close(); @@ -135,7 +135,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement { String filename = m_repodir + Slash.DirectorySeparatorChar + regionid + Slash.DirectorySeparatorChar + "heightmap.r32"; - FileStream fs = new FileStream( filename, FileMode.Open); + FileStream fs = new FileStream(filename, FileMode.Open); StreamReader sr = new StreamReader(fs); String result = sr.ReadToEnd(); sr.Close(); @@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.ContentManagement try { logLocation = revisionDir + Slash.DirectorySeparatorChar + "log"; - fs = new FileStream( logLocation, FileMode.Open); + fs = new FileStream(logLocation, FileMode.Open); sr = new StreamReader(fs); logMessage = sr.ReadToEnd(); sr.Close(); diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs index c1c255b..a40a0d9 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs @@ -170,7 +170,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule SceneObjectPart sop = GetSOP(); IObjectMaterial[] rets = new IObjectMaterial[getNumberOfSides(sop)]; - for (int i = 0; i < rets.Length;i++ ) + for (int i = 0; i < rets.Length; i++) { rets[i] = new SOPObjectMaterial(i, sop); } diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index f006cf1..58c2a15 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs @@ -459,7 +459,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin { lock (m_prims) { - foreach ( BulletDotNETPrim prim in m_prims) + foreach (BulletDotNETPrim prim in m_prims) { if (prim.Body != null) m_world.removeRigidBody(prim.Body); diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 253f451..06cfcdd 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs @@ -429,8 +429,7 @@ namespace OpenSim.Region.Physics.Meshing { #if SPAM m_log.Debug("Meshmerizer: prim " + primName + " has a size of " + size.ToString() + " which is below threshold of " + - -minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); + minSizeForComplexMesh.ToString() + " - creating simple bounding box"); #endif mesh = CreateBoundingBoxMesh(mesh); mesh.DumpRaw(baseDir, primName, "Z extruded"); @@ -443,6 +442,5 @@ minSizeForComplexMesh.ToString() + " - creating simple bounding box" ); return mesh; } - } } diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 6759fd9..3f0d6c1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs @@ -1116,7 +1116,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - " + (Shell!=IntPtr.Zero ? "Shell ":"") + (Body!=IntPtr.Zero ? "Body ":"") - + (Amotor!=IntPtr.Zero ? "Amotor ":"") ); + + (Amotor!=IntPtr.Zero ? "Amotor ":"")); } AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor); @@ -1182,7 +1182,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - " + (Shell==IntPtr.Zero ? "Shell ":"") + (Body==IntPtr.Zero ? "Body ":"") - + (Amotor==IntPtr.Zero ? "Amotor ":"") ); + + (Amotor==IntPtr.Zero ? "Amotor ":"")); } } diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index e6f45c8..d8d3b68 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs @@ -2593,7 +2593,7 @@ namespace OpenSim.Region.Physics.OdePlugin if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02) - && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01 )) + && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01)) { _zeroFlag = true; m_throttleUpdates = false; @@ -2981,7 +2981,7 @@ namespace OpenSim.Region.Physics.OdePlugin Matrix4 transposeMatrix = new Matrix4(); for (int i = 0; i < 4; i++) for (int j = 0; j < 4; j++) - Matrix4SetValue( ref transposeMatrix, i, j, pMat[j, i]); + Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]); return transposeMatrix; } diff --git a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs index e6b84ae..063b14f 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEVehicleSettings.cs @@ -234,7 +234,7 @@ namespace OpenSim.Region.Physics.OdePlugin SetDefaultsForType(pType); Reset(); } - else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE ) + else if (m_type != Vehicle.TYPE_NONE && pType != Vehicle.TYPE_NONE) { // Set properties SetDefaultsForType(pType); @@ -408,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin // m_bankingMix = 0.8f; // m_bankingTimescale = 1; // m_referenceFrame = Quaternion.Identity; - m_flags &= ~( VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); + m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT); m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP); break; diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 713269c..60ac724 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -3261,7 +3261,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth, heightmapHeight, (int) heightmapWidthSamples, (int) heightmapHeightSamples, scale, offset, thickness, wrap); - d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1 ); + d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1 , hfmax + 1); LandGeom = d.CreateHeightfield(space, HeightmapData, 1); if (LandGeom != IntPtr.Zero) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 40889ca..d812e48 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -2856,7 +2856,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m_TransferModule != null) { - m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); } ScriptSleep(2000); } @@ -3668,7 +3668,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api bucket); if (m_TransferModule != null) - m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); } else { @@ -5968,7 +5968,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api bucket); if (m_TransferModule != null) - m_TransferModule.SendInstantMessage(msg, delegate(bool success) {} ); + m_TransferModule.SendInstantMessage(msg, delegate(bool success) {}); } public void llSetVehicleType(int type) @@ -6008,7 +6008,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (!m_host.ParentGroup.IsDeleted) { m_host.ParentGroup.RootPart.SetVehicleVectorParam(param, - new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z) ); + new PhysicsVector((float)vec.x, (float)vec.y, (float)vec.z)); } } } @@ -7039,7 +7039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api return (double)Math.Log(val); } - public LSL_List llGetAnimationList( string id ) + public LSL_List llGetAnimationList(string id) { m_host.AddScriptLPS(1); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7f3db9c..73c3e4c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs @@ -586,7 +586,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Check for hostname , attempt to make a hglink // and convert the regionName to the target region - if ( regionName.Contains(".") && regionName.Contains(":")) + if (regionName.Contains(".") && regionName.Contains(":")) { // Try to link the region RegionInfo regInfo = HGHyperlink.TryLinkRegion(World, diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index c8ed93c..2501752 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs @@ -206,7 +206,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase // DO NOT THROW JUST THE INNER EXCEPTION! // FriendlyErrors depends on getting the whole exception! // - if ( !(tie.InnerException is EventAbortException) ) + if (!(tie.InnerException is EventAbortException)) { throw; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs index 9cdffaa..d8f44c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs @@ -1407,7 +1407,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog throw new PrologException(Atom.a("instantiation_error"), "Arg 1 Char and arg 2 Code are both unbound variables"); - return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt} ))); + return YP.unify(Char, Atom.a(new String(new char[] {(char)codeInt}))); } else { @@ -2343,7 +2343,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog string results = ""; for (Match m = Regex.Match(inData,inPattern); m.Success; m=m.NextMatch()) { - //m_log.Debug( m ); + //m_log.Debug(m); results += presep+ m + postsep; } return results; diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 91747af..41ecfd3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs @@ -676,20 +676,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // It's possible that we don't have an assignment, in which case // the child will be null and we only print the semicolon. - // for ( x = 0 ; x < 10 ; x++ ) - // ^^^^^^^ + // for (x = 0; x < 10; x++) + // ^^^^^ ForLoopStatement s = (ForLoopStatement) fl.kids.Pop(); if (null != s) { retstr += GenerateForLoopStatement(s); } retstr += Generate("; "); - // for ( x = 0 ; x < 10 ; x++ ) - // ^^^^^^^^ + // for (x = 0; x < 10; x++) + // ^^^^^^ retstr += GenerateNode((SYMBOL) fl.kids.Pop()); retstr += Generate("; "); - // for ( x = 0 ; x < 10 ; x++ ) - // ^^^^^ + // for (x = 0; x < 10; x++) + // ^^^ retstr += GenerateForLoopStatement((ForLoopStatement) fl.kids.Pop()); retstr += GenerateLine(")"); diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 5c7ce43..a1525b9 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs @@ -573,7 +573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools display--; string severity = "Error"; - if ( CompErr.IsWarning ) + if (CompErr.IsWarning) { severity = "Warning"; } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs index cacb8be..e77b3d2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/LSL2CSCodeTransformer.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools // It's possible that a child is null, for instance when the // assignment part in a for-loop is left out, ie: // - // for ( ; i < 10; i++) + // for (; i < 10; i++) // { // ... // } diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index a641605..bdacf8b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -447,7 +447,7 @@ namespace OpenSim.Region.ScriptEngine.Shared // down-cast from Object to the correct type. // Note: no checks for item index being valid are performed - public LSL_Types.LSLFloat GetLSLFloatItem( int itemIndex ) + public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex) { if (m_data[itemIndex] is LSL_Types.LSLInteger) { diff --git a/OpenSim/Region/UserStatistics/HTMLUtil.cs b/OpenSim/Region/UserStatistics/HTMLUtil.cs index bd0c74a..c07619f 100644 --- a/OpenSim/Region/UserStatistics/HTMLUtil.cs +++ b/OpenSim/Region/UserStatistics/HTMLUtil.cs @@ -43,6 +43,7 @@ namespace OpenSim.Region.UserStatistics } o.Append(">\n\t"); } + public static void TR_C(ref StringBuilder o) { o.Append("\n"); @@ -52,6 +53,7 @@ namespace OpenSim.Region.UserStatistics { TD_O(ref o, pclass, 0, 0); } + public static void TD_O(ref StringBuilder o, string pclass, int rowspan, int colspan) { o.Append(""); } + public static void TD_C(ref StringBuilder o) { o.Append(""); } + public static void TABLE_O(ref StringBuilder o, string pclass) { o.Append("\n\t"); } + public static void TABLE_C(ref StringBuilder o) { o.Append("\n"); @@ -208,24 +213,22 @@ namespace OpenSim.Region.UserStatistics }); // ]]> "); - } - public static void HtmlHeaders_O ( ref StringBuilder o) + public static void HtmlHeaders_O(ref StringBuilder o) { o.Append("\n"); o.Append(""); o.Append(""); - - } - public static void HtmlHeaders_C ( ref StringBuilder o) + + public static void HtmlHeaders_C(ref StringBuilder o) { o.Append(""); o.Append(""); } - public static void AddReportLinks( ref StringBuilder o, Dictionary reports, string pClass) + public static void AddReportLinks(ref StringBuilder o, Dictionary reports, string pClass) { int repcount = 0; foreach (string str in reports.Keys) @@ -242,7 +245,8 @@ namespace OpenSim.Region.UserStatistics } } } - public static void A( ref StringBuilder o, string linktext, string linkhref, string pClass) + + public static void A(ref StringBuilder o, string linktext, string linkhref, string pClass) { o.Append(" 0) @@ -254,7 +258,6 @@ namespace OpenSim.Region.UserStatistics o.Append("\">"); o.Append(linktext); o.Append(""); - } } } diff --git a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs index 85d2e03..811baba 100644 --- a/OpenSim/Region/UserStatistics/LogLinesAJAX.cs +++ b/OpenSim/Region/UserStatistics/LogLinesAJAX.cs @@ -76,7 +76,7 @@ namespace OpenSim.Region.UserStatistics string formatopen = ""; string formatclose = ""; - for (int i = 0; i < result.Length;i++ ) + for (int i = 0; i < result.Length; i++) { if (result[i].Length >= 30) { diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 715d295..e383e71 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs @@ -398,7 +398,7 @@ namespace OpenSim.Region.UserStatistics } - public string readLogLines( int amount) + public string readLogLines(int amount) { Encoding encoding = Encoding.ASCII; int sizeOfChar = encoding.GetByteCount("\n"); -- cgit v1.1