From a23d64dec1cbf88abc3c7e84664a683dee534e4a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Wed, 10 Jun 2009 04:28:56 +0000 Subject: [PATCH] Formatting cleanup. --- .../CreateCommsManagerPlugin.cs | 4 ++-- .../Rest/Inventory/RestHandler.cs | 14 ++++++-------- .../Rest/Inventory/RestInventoryServices.cs | 6 +++--- .../Data/NHibernate/NHibernateRegionData.cs | 2 +- OpenSim/Data/RegionProfileServiceProxy.cs | 2 +- OpenSim/Data/SQLite/SQLiteUserData.cs | 8 ++++---- .../Communications/Cache/CachedUserInfo.cs | 2 +- .../Tests/Cache/AssetCacheTests.cs | 2 +- OpenSim/Framework/IClientAPI.cs | 2 +- OpenSim/Framework/ICnmCache.cs | 8 ++++---- .../Framework/Servers/BaseOpenSimServer.cs | 6 +++--- .../Servers/HttpServer/LLSDMethod.cs | 2 +- .../Tests/BaseRequestHandlerTests.cs | 2 +- .../Tests/GetAssetStreamHandlerTests.cs | 2 +- .../Servers/Tests/VersionInfoTests.cs | 2 +- OpenSim/Framework/UserConfig.cs | 2 +- OpenSim/Framework/Util.cs | 4 ++-- OpenSim/Framework/WearableItem.cs | 2 +- OpenSim/Region/Application/OpenSimBase.cs | 2 +- .../ClientStack/LindenUDP/LLClientView.cs | 4 ++-- .../Hypergrid/HGGridServices.cs | 2 +- .../Local/LocalInventoryService.cs | 2 +- .../Communications/OGS1/OGS1GridServices.cs | 2 +- .../CoreModules/Asset/FlotsamAssetCache.cs | 6 +++--- .../InstantMessage/InstantMessageModule.cs | 2 +- .../Transfer/InventoryTransferModule.cs | 6 +++--- .../InterGrid/OpenGridProtocolModule.cs | 4 ++-- .../World/WorldMap/MapImageModule.cs | 2 +- .../Framework/Scenes/RegionStatsHandler.cs | 4 ++-- .../Region/Framework/Scenes/SceneManager.cs | 2 +- .../Framework/Scenes/SceneObjectPart.cs | 4 ++-- .../Region/Framework/Scenes/ScenePresence.cs | 2 +- .../Scenes/Tests/EntityManagerTests.cs | 8 ++++---- .../Avatar/Chat/ChannelState.cs | 6 +++--- .../FreeSwitchVoice/FreeSwitchDirectory.cs | 10 +++++----- .../FreeSwitchVoice/FreeSwitchVoiceModule.cs | 2 +- .../Avatar/XmlRpcGroups/XmlRpcGroupsModule.cs | 2 +- .../ContentManagementSystem/CMModel.cs | 2 +- .../FileSystemDatabase.cs | 6 +++--- .../Scripting/Minimodule/SOPObject.cs | 2 +- .../BulletDotNETPlugin/BulletDotNETScene.cs | 2 +- OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 4 +--- .../Region/Physics/OdePlugin/ODECharacter.cs | 4 ++-- OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 4 ++-- .../Physics/OdePlugin/ODEVehicleSettings.cs | 4 ++-- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 2 +- .../Shared/Api/Implementation/LSL_Api.cs | 10 +++++----- .../Shared/Api/Implementation/OSSL_Api.cs | 2 +- .../Shared/Api/Runtime/Executor.cs | 2 +- .../Shared/Api/Runtime/YieldProlog/YP.cs | 4 ++-- .../Shared/CodeTools/CSCodeGenerator.cs | 12 ++++++------ .../ScriptEngine/Shared/CodeTools/Compiler.cs | 2 +- .../Shared/CodeTools/LSL2CSCodeTransformer.cs | 2 +- .../Region/ScriptEngine/Shared/LSL_Types.cs | 2 +- OpenSim/Region/UserStatistics/HTMLUtil.cs | 19 +++++++++++-------- OpenSim/Region/UserStatistics/LogLinesAJAX.cs | 2 +- .../Region/UserStatistics/WebStatsModule.cs | 2 +- OpenSim/Tests/Common/Mock/TestAssetCache.cs | 2 +- .../Setup/GetAssetStreamHandlerTestHelpers.cs | 2 +- .../GUI/WinForm/ProcessPanel.cs | 2 +- OpenSim/Tools/pCampBot/PhysicsBot.cs | 2 +- 61 files changed, 120 insertions(+), 121 deletions(-) diff --git a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs index d2cb788bc5..d56a9d9275 100644 --- a/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs +++ b/OpenSim/ApplicationPlugins/CreateCommsManager/CreateCommsManagerPlugin.cs @@ -181,7 +181,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); - if (m_openSim.userStatsURI != String.Empty ) + if (m_openSim.userStatsURI != String.Empty) m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); } @@ -213,7 +213,7 @@ namespace OpenSim.ApplicationPlugins.CreateCommsManager m_httpServer.AddStreamHandler(new OpenSim.SimStatusHandler()); m_httpServer.AddStreamHandler(new OpenSim.XSimStatusHandler(m_openSim)); - if (m_openSim.userStatsURI != String.Empty ) + if (m_openSim.userStatsURI != String.Empty) m_httpServer.AddStreamHandler(new OpenSim.UXSimStatusHandler(m_openSim)); } diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 6f41c035b6..13f6426c2e 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs @@ -392,9 +392,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory // on anything other than a URI token boundary. Otherwise we // may match on URL's that were not intended for this handler. - return ( path.Length == key.Length || - path.Substring(key.Length,1) == Rest.UrlPathSeparator); - + return (path.Length == key.Length || + path.Substring(key.Length, 1) == Rest.UrlPathSeparator); } } @@ -416,9 +415,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory // on anything other than a URI token boundary. Otherwise we // may match on URL's that were not intended for this handler. - return ( path.Length == key.Length || - path.Substring(key.Length,1) == Rest.UrlPathSeparator); - + return (path.Length == key.Length || + path.Substring(key.Length, 1) == Rest.UrlPathSeparator); } } } @@ -465,8 +463,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory try { - handled = ( FindPathHandler(request, response) || - FindStreamHandler(request, response) ); + handled = (FindPathHandler(request, response) || + FindStreamHandler(request, response)); } catch (Exception e) { diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index 7798ebd852..695784bad1 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs @@ -740,7 +740,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory // Scan the set of folders in the entity collection for an // entry that matches the context folder. It is assumed that - // the only reliable indicator of this is a zero UUID ( using + // the only reliable indicator of this is a zero UUID (using // implicit context), or the parent's UUID matches that of the // URI designated node (explicit context). We don't allow // ambiguity in this case because this is POST and we are @@ -1621,7 +1621,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory foreach (InventoryFolderBase parent in ic.rdata.folders) { - if ( parent.ID == result.ParentID ) + if (parent.ID == result.ParentID) { found = true; break; @@ -2002,7 +2002,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory foreach (InventoryFolderBase parent in ic.rdata.folders) { - if ( parent.ID == ic.Item.Folder ) + if (parent.ID == ic.Item.Folder) { found = true; break; diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs index c62520cd97..3f04f6815c 100644 --- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs +++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs @@ -183,7 +183,7 @@ namespace OpenSim.Data.NHibernate ICriteria criteria = manager.GetSession().CreateCriteria(typeof(SceneObjectPart)); criteria.Add(Expression.Eq("RegionID", region)); criteria.Add(Expression.Eq("ParentUUID", uuid)); - criteria.AddOrder( Order.Asc("ParentID") ); + criteria.AddOrder(Order.Asc("ParentID")); foreach (SceneObjectPart p in criteria.List()) { diff --git a/OpenSim/Data/RegionProfileServiceProxy.cs b/OpenSim/Data/RegionProfileServiceProxy.cs index e9d0036ac1..20d7df02d9 100644 --- a/OpenSim/Data/RegionProfileServiceProxy.cs +++ b/OpenSim/Data/RegionProfileServiceProxy.cs @@ -113,7 +113,7 @@ namespace OpenSim.Data public RegionProfileData RequestSimProfileData(string regionName, Uri gridserverUrl, string gridserverSendkey, string gridserverRecvkey) { - return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName ); + return RequestSimData(gridserverUrl, gridserverSendkey, "region_name_search", regionName); } } } diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs index f2d97d7d0d..74d26338d0 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs @@ -1195,14 +1195,14 @@ namespace OpenSim.Data.SQLite private void setupAgentCommands(SqliteDataAdapter da, SqliteConnection conn) { - da.InsertCommand = SQLiteUtil.createInsertCommand( "useragents", ds.Tables["useragents"]); + da.InsertCommand = SQLiteUtil.createInsertCommand("useragents", ds.Tables["useragents"]); da.InsertCommand.Connection = conn; - da.UpdateCommand = SQLiteUtil.createUpdateCommand( "useragents", "UUID=:UUID", ds.Tables["useragents"]); + da.UpdateCommand = SQLiteUtil.createUpdateCommand("useragents", "UUID=:UUID", ds.Tables["useragents"]); da.UpdateCommand.Connection = conn; - SqliteCommand delete = new SqliteCommand( "delete from useragents where UUID = :ProfileID"); - delete.Parameters.Add( SQLiteUtil.createSqliteParameter( "ProfileID", typeof(String))); + SqliteCommand delete = new SqliteCommand("delete from useragents where UUID = :ProfileID"); + delete.Parameters.Add(SQLiteUtil.createSqliteParameter("ProfileID", typeof(String))); delete.Connection = conn; da.DeleteCommand = delete; } diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index cf6a7980d1..5181bdaea8 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -286,7 +286,7 @@ namespace OpenSim.Framework.Communications.Cache // Take all ther received items and put them into the folder tree heirarchy foreach (InventoryItemBase item in items) { InventoryFolderImpl folder = resolvedFolders.ContainsKey(item.Folder) ? resolvedFolders[item.Folder] : null; - ItemReceive(item, folder ); + ItemReceive(item, folder); } } catch (Exception e) diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs index 8061c8fa11..f30d28bb04 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs @@ -64,7 +64,7 @@ namespace OpenSim.Framework.Communications.Tests { UserProfileData userProfile = new UserProfileData(); -// userProfile.ID = new UUID( Util.GetHashGuid( uri.ToString(), AssetCache.AssetInfo.Secret )); +// userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret)); return userProfile; } diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index d0ae186f17..5d169cfc71 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -192,7 +192,7 @@ namespace OpenSim.Framework public delegate void ParcelReturnObjectsRequest( int local_id, uint return_type, UUID[] agent_ids, UUID[] selected_ids, IClientAPI remote_client); - public delegate void ParcelDeedToGroup( int local_id, UUID group_id, IClientAPI remote_client); + public delegate void ParcelDeedToGroup(int local_id, UUID group_id, IClientAPI remote_client); public delegate void EstateOwnerMessageRequest( UUID AgentID, UUID SessionID, UUID TransactionID, UUID Invoice, byte[] Method, byte[][] Parameters, diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs index 2f62189594..a1ac3227c2 100644 --- a/OpenSim/Framework/ICnmCache.cs +++ b/OpenSim/Framework/ICnmCache.cs @@ -348,7 +348,7 @@ namespace OpenSim.Framework /// /// /// - void Remove( TKey key ); + void Remove(TKey key); /// /// Removes elements that are associated with one of from the . @@ -364,7 +364,7 @@ namespace OpenSim.Framework /// /// /// - void RemoveRange( IEnumerable keys ); + void RemoveRange(IEnumerable keys); /// /// Add or replace an element with the provided , and to @@ -411,7 +411,7 @@ namespace OpenSim.Framework /// /// /// - bool Set( TKey key, TValue value, long size ); + bool Set(TKey key, TValue value, long size); /// /// Gets the associated with the specified . @@ -436,6 +436,6 @@ namespace OpenSim.Framework /// /// /// - bool TryGetValue( TKey key, out TValue value ); + bool TryGetValue(TKey key, out TValue value); } } diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index aa09c602e1..d2193ca141 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -490,13 +490,13 @@ namespace OpenSim.Framework.Servers public string StatReport(OSHttpRequest httpRequest) { // If we catch a request for "callback", wrap the response in the value for jsonp - if ( httpRequest.Query.ContainsKey("callback")) + if (httpRequest.Query.ContainsKey("callback")) { - return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ) + ");"; + return httpRequest.Query["callback"].ToString() + "(" + m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");"; } else { - return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version ); + return m_stats.XReport((DateTime.Now - m_startuptime).ToString() , m_version); } } diff --git a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs index 87ba0d9cbd..35655c6bd7 100644 --- a/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs +++ b/OpenSim/Framework/Servers/HttpServer/LLSDMethod.cs @@ -30,6 +30,6 @@ using OpenMetaverse.StructuredData; namespace OpenSim.Framework.Servers.HttpServer { - public delegate OSD LLSDMethod( string path, OSD request, string endpoint ); + public delegate OSD LLSDMethod(string path, OSD request, string endpoint); public delegate OSD DefaultLLSDMethod(OSD request, IPEndPoint client); } diff --git a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs index 3f17859e46..2fa118d4e4 100644 --- a/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs +++ b/OpenSim/Framework/Servers/HttpServer/Tests/BaseRequestHandlerTests.cs @@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer.Tests [Test] public void TestConstructor() { - new BaseRequestHandlerImpl( null, null ); + new BaseRequestHandlerImpl(null, null); } [Test] diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index 6a4918d196..afb4a657bb 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs @@ -50,7 +50,7 @@ namespace OpenSim.Framework.Servers.Tests TestHelper.InMethod(); // GetAssetStreamHandler handler = - new GetAssetStreamHandler( null ); + new GetAssetStreamHandler(null); } [Test] diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs index 3df56a58ab..49e5061316 100644 --- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs +++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs @@ -38,7 +38,7 @@ namespace OpenSim.Framework.Servers.Tests [Test] public void TestVersionLength() { - Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars." ); + Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.Version.Length," VersionInfo.Version string not " + VersionInfo.VERSIONINFO_VERSION_LENGTH + " chars."); } [Test] diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index 3fedf227ab..31838ad155 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs @@ -165,7 +165,7 @@ namespace OpenSim.Framework DefaultStartupMsg = (string) configuration_result; break; case "default_grid_server": - GridServerURL = new Uri( (string) configuration_result ); + GridServerURL = new Uri((string) configuration_result); break; case "grid_send_key": GridSendKey = (string) configuration_result; diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index d6202eae44..0a9b67d467 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -1060,11 +1060,11 @@ namespace OpenSim.Framework public static Guid GetHashGuid(string data, string salt) { - byte[] hash = ComputeMD5Hash( data + salt ); + byte[] hash = ComputeMD5Hash(data + salt); //string s = BitConverter.ToString(hash); - Guid guid = new Guid( hash ); + Guid guid = new Guid(hash); return guid; } diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs index 6675127748..159306acc0 100644 --- a/OpenSim/Framework/WearableItem.cs +++ b/OpenSim/Framework/WearableItem.cs @@ -131,7 +131,7 @@ namespace OpenSim.Framework { //int randNum = Util.RandomClass.Next(0, 1000); float range = setting.VisualParam.MaxValue - setting.VisualParam.MinValue; - // float val =((float) randNum )/ ((float)(1000.0f / range)); + // float val = ((float) randNum) / ((float)(1000.0f / range)); float val = (float)Util.RandomClass.NextDouble() * range * 0.2f; setting.Value = setting.VisualParam.MinValue + (range / 2) + val; } diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index a1d4b315d6..1ff53c9084 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 ac5b27e82a..7d4bb8e354 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 f30b9f7a18..58711e5dde 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 bb4ee335bc..3712fb9351 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 7990c9be8b..f82a6a19ae 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 d09f5efbd8..35713ad729 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 8cc2655ca9..66f1e14aeb 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 986f604851..12f5d196ea 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 da43ce8a6c..b8cc308e22 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 99a294d147..7afada3a84 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 d26385d410..7c02f9ab6b 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 72ed646101..0019b23c85 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 84d7c4cc09..de78f5f16a 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 5d8760f26b..bc421c27ea 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 582dc0f0ff..52c4e033e7 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 9a91fbfd60..a3d7977006 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 c1c255beb0..a40a0d972d 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 f006cf1851..58c2a1501b 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 253f451e46..06cfcdd3d8 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 6759fd976e..3f0d6c148c 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 e6f45c85f3..d8d3b68f6a 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 e6b84ae12a..063b14f9d9 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 713269c1e1..60ac724176 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 40889ca865..d812e4889d 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 7f3db9cb1b..73c3e4ca01 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 c8ed93cf97..2501752039 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 9cdffaa824..d8f44c1542 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 91747af6b8..41ecfd3c89 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 5c7ce436ae..a1525b9b7a 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 cacb8beac0..e77b3d2100 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 a641605047..bdacf8bef7 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 bd0c74a1c6..c07619f6db 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 85d2e037b2..811baba998 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 715d295a08..e383e71e22 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"); diff --git a/OpenSim/Tests/Common/Mock/TestAssetCache.cs b/OpenSim/Tests/Common/Mock/TestAssetCache.cs index 66886d02c4..ebbea75f15 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetCache.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetCache.cs @@ -103,7 +103,7 @@ namespace OpenSim.Tests.Common.Mock public void AddAsset(AssetBase asset) { - CreateAsset( asset ); + CreateAsset(asset); } public void ExpireAsset(UUID assetID) diff --git a/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs b/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs index d338f009d5..ffa7283a61 100644 --- a/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs +++ b/OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs @@ -103,7 +103,7 @@ namespace OpenSim.Tests.Common.Setup public static AssetBase CreateTestAsset() { byte[] expected = new byte[] { 1,2,3 }; - AssetBase asset = new AssetBase( ); + AssetBase asset = new AssetBase(); asset.ID = Guid.NewGuid().ToString(); asset.Data = expected; asset.Type = 2; diff --git a/OpenSim/Tools/OpenSim.GridLaunch/GUI/WinForm/ProcessPanel.cs b/OpenSim/Tools/OpenSim.GridLaunch/GUI/WinForm/ProcessPanel.cs index c7c1243275..f0ed2ca7b6 100644 --- a/OpenSim/Tools/OpenSim.GridLaunch/GUI/WinForm/ProcessPanel.cs +++ b/OpenSim/Tools/OpenSim.GridLaunch/GUI/WinForm/ProcessPanel.cs @@ -194,7 +194,7 @@ namespace OpenSim.GridLaunch.GUI.WinForm cblStartupComponents.Items.AddRange(arr); // Now correct all check states - for (int i = 0; i < cblStartupComponents.Items.Count; i++ ) + for (int i = 0; i < cblStartupComponents.Items.Count; i++) { string _name = cblStartupComponents.Items[i] as string; bool _checked = Program.Settings.Components[_name]; diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs index 76d244130e..36a5ef6643 100644 --- a/OpenSim/Tools/pCampBot/PhysicsBot.cs +++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs @@ -379,7 +379,7 @@ namespace pCampBot { client.Assets.RequestImage(prim.Textures.DefaultTexture.TextureID, ImageType.Normal); } - for (int i = 0; i < prim.Textures.FaceTextures.Length; i++ ) + for (int i = 0; i < prim.Textures.FaceTextures.Length; i++) { if (prim.Textures.FaceTextures[i] != null) {