From 6ef9d4da901a346c232458317cca6268da888e2e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 18 Aug 2008 00:39:10 +0000 Subject: Formatting cleanup. --- OpenSim/Framework/AvatarAppearance.cs | 2 +- OpenSim/Framework/Cache.cs | 4 +- .../Framework/Communications/Cache/AssetCache.cs | 14 ++-- .../Communications/Cache/AssetServerBase.cs | 10 +-- .../Communications/Cache/CachedUserInfo.cs | 6 +- .../Communications/Cache/GridAssetClient.cs | 2 +- .../Communications/Cache/InventoryFolderImpl.cs | 34 ++++---- .../Cache/UserProfileCacheService.cs | 2 +- .../Framework/Communications/Capabilities/Caps.cs | 4 +- .../Capabilities/LLSDRemoteParcelResponse.cs | 2 +- .../Communications/CommunicationsManager.cs | 32 +++---- OpenSim/Framework/Communications/IGridServices.cs | 6 +- .../IInterServiceInventoryServices.cs | 8 +- .../Framework/Communications/IInventoryServices.cs | 4 +- .../Communications/ISecureInventoryService.cs | 8 +- .../Communications/InventoryServiceBase.cs | 6 +- OpenSim/Framework/Communications/LoginService.cs | 9 +- .../Framework/Communications/UserManagerBase.cs | 4 +- .../Configuration/XML/XmlConfiguration.cs | 4 +- OpenSim/Framework/Console/ConsoleBase.cs | 4 +- OpenSim/Framework/Console/ConsolePluginCommand.cs | 20 ++--- OpenSim/Framework/Console/OpenSimAppender.cs | 4 +- OpenSim/Framework/IAssetProvider.cs | 2 +- OpenSim/Framework/IClientAPI.cs | 14 ++-- OpenSim/Framework/IInventoryData.cs | 2 +- OpenSim/Framework/IPlugin.cs | 8 +- OpenSim/Framework/IUserData.cs | 2 +- OpenSim/Framework/LandData.cs | 6 +- OpenSim/Framework/LandStatReportItem.cs | 2 +- OpenSim/Framework/PluginLoader.cs | 98 +++++++++++----------- OpenSim/Framework/PrimitiveBaseShape.cs | 28 +++---- OpenSim/Framework/RegionCommsListener.cs | 6 +- OpenSim/Framework/RegionInfo.cs | 21 +++-- OpenSim/Framework/RegionSettings.cs | 68 +++++++-------- OpenSim/Framework/Servers/BaseHttpServer.cs | 4 +- OpenSim/Framework/Servers/BaseOpenSimServer.cs | 46 +++++----- OpenSim/Framework/Servers/OSHttpHandler.cs | 16 ++-- OpenSim/Framework/Servers/OSHttpHttpHandler.cs | 10 +-- OpenSim/Framework/Servers/OSHttpRequest.cs | 22 ----- OpenSim/Framework/Servers/OSHttpRequestPump.cs | 39 +++++---- OpenSim/Framework/Servers/OSHttpRequestQueue.cs | 6 +- OpenSim/Framework/Servers/OSHttpResponse.cs | 74 ++++++++-------- OpenSim/Framework/Servers/OSHttpServer.cs | 8 +- OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs | 28 +++---- OpenSim/Framework/Servers/RestSessionService.cs | 4 +- OpenSim/Framework/Statistics/BaseStatsCollector.cs | 6 +- .../Framework/Statistics/SimExtraStatsCollector.cs | 46 +++++----- OpenSim/Framework/TaskInventoryItem.cs | 4 +- OpenSim/Framework/Util.cs | 4 +- 49 files changed, 369 insertions(+), 394 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 4456138..3133f83 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs @@ -371,7 +371,7 @@ namespace OpenSim.Framework VisualParams = (byte[])h["visual_params"]; Texture = new LLObject.TextureEntry((byte[])h["texture"], 0, ((byte[])h["texture"]).Length); AvatarHeight = (float)Convert.ToDouble((string)h["avatar_height"]); - + m_wearables = new AvatarWearable[MAX_WEARABLES]; for (int i = 0; i < MAX_WEARABLES; i++) { diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs index d002530..427072d 100644 --- a/OpenSim/Framework/Cache.cs +++ b/OpenSim/Framework/Cache.cs @@ -380,7 +380,7 @@ namespace Opensim.Framework default: return; } - + Store(index, data, container); } @@ -403,7 +403,7 @@ namespace Opensim.Framework if ((m_Flags & CacheFlags.AllowUpdate) != 0) { item = GetItem(index); - + item.hits++; item.lastUsed = DateTime.Now; if (m_DefaultTTL.Ticks != 0) diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 6eff690..e924b3f 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs @@ -143,10 +143,10 @@ namespace OpenSim.Framework.Communications.Cache public void Clear() { m_log.Info("[ASSET CACHE]: Clearing Asset cache"); - + if (StatsManager.SimExtraStats != null) StatsManager.SimExtraStats.ClearAssetCacheStatistics(); - + Initialize(); } @@ -365,9 +365,9 @@ namespace OpenSim.Framework.Communications.Cache } } else - { + { if (!Assets.ContainsKey(asset.FullID)) - { + { AssetInfo assetInf = new AssetInfo(asset); Assets.Add(assetInf.FullID, assetInf); @@ -382,7 +382,7 @@ namespace OpenSim.Framework.Communications.Cache } } - /// + /// /// Allows you to clear a specific asset by uuid out /// of the asset cache. This is needed because the osdynamic /// texture code grows the asset cache without bounds. The @@ -399,8 +399,8 @@ namespace OpenSim.Framework.Communications.Cache if (Textures.ContainsKey(uuid)) { Textures.Remove(uuid); - } - else if (Assets.ContainsKey(uuid)) + } + else if (Assets.ContainsKey(uuid)) { Assets.Remove(uuid); } diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index ed5b896..2c8e685 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs @@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications.Cache /// /// /// - /// Thrown if the request failed for some other reason than that the + /// Thrown if the request failed for some other reason than that the /// asset cannot be found. /// protected abstract AssetBase GetAsset(AssetRequest req); @@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications.Cache protected virtual void ProcessRequest(AssetRequest req) { AssetBase asset; - + try { asset = GetAsset(req); @@ -78,12 +78,12 @@ namespace OpenSim.Framework.Communications.Cache catch (Exception e) { m_log.ErrorFormat("[ASSET]: Asset request for {0} threw exception {1}", req.AssetID, e); - + if (StatsManager.SimExtraStats != null) StatsManager.SimExtraStats.AddAssetServiceRequestFailure(); - + m_receiver.AssetNotFound(req.AssetID, req.IsTexture); - + return; } diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 57f5e76..c337907 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs @@ -91,8 +91,8 @@ namespace OpenSim.Framework.Communications.Cache get { return m_session_id; } set { m_session_id = value; } } - private LLUUID m_session_id = LLUUID.Zero; - + private LLUUID m_session_id = LLUUID.Zero; + /// /// Constructor /// @@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications.Cache } } } - + /// /// Drop all cached inventory. /// diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 4206cae..9cccf66 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs @@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache rc.AddQueryParameter("texture"); rc.RequestMethod = "GET"; - + Stream s = rc.Request(); if (s.Length > 0) diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index d7de9d6..61cfc1a 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs @@ -37,19 +37,19 @@ namespace OpenSim.Framework.Communications.Cache public class InventoryFolderImpl : InventoryFolderBase { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + public static readonly string PATH_DELIMITER = "/"; /// /// Items that are contained in this folder /// public Dictionary Items = new Dictionary(); - + /// /// Child folders that are contained in this folder /// public Dictionary SubFolders = new Dictionary(); - + // Constructors public InventoryFolderImpl(InventoryFolderBase folderbase) { @@ -195,15 +195,15 @@ namespace OpenSim.Framework.Communications.Cache return null; } - + /// /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder - /// + /// /// This method does not handle paths that contain multiple delimitors - /// + /// /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some /// XPath like expression - /// + /// /// FIXME: Delimitors which occur in names themselves are not currently escapable. /// /// @@ -214,7 +214,7 @@ namespace OpenSim.Framework.Communications.Cache { if (path == string.Empty) return this; - + string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); lock (SubFolders) @@ -228,19 +228,19 @@ namespace OpenSim.Framework.Communications.Cache return folder; } } - + // We didn't find a folder with the given name return null; } - + /// /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. - /// + /// /// This method does not handle paths that contain multiple delimitors - /// + /// /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some /// XPath like expression - /// + /// /// FIXME: Delimitors which occur in names themselves are not currently escapable. /// /// @@ -248,7 +248,7 @@ namespace OpenSim.Framework.Communications.Cache /// /// null if the item is not found public InventoryItemBase FindItemByPath(string path) - { + { string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); if (components.Length == 1) @@ -263,7 +263,7 @@ namespace OpenSim.Framework.Communications.Cache } } else - { + { lock (SubFolders) { foreach (InventoryFolderImpl folder in SubFolders.Values) @@ -273,10 +273,10 @@ namespace OpenSim.Framework.Communications.Cache } } } - + // We didn't find an item or intermediate folder with the given name return null; - } + } /// /// Return a copy of the list of child items in this folder diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 1360aa3..4e3840b 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs @@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Cache m_log.WarnFormat( "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId); - + return false; } diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 1aa8eb0..24fe0f4 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Capabilities mapLayer.Right = 5000; mapLayer.Top = 5000; mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); - + return mapLayer; } @@ -783,7 +783,7 @@ namespace OpenSim.Framework.Communications.Capabilities // TODO: probably make this a better set of extensions here string extension = ".jp2"; - if (m_invType != "image") + if (m_invType != "image") { extension = ".dat"; } diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs index 1c8f27f..b0e2b8f 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs @@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities public class LLSDRemoteParcelResponse { public LLUUID parcel_id; - + public LLSDRemoteParcelResponse() { } diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 2bfe045..08dbc80 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -41,26 +41,26 @@ namespace OpenSim.Framework.Communications public class CommunicationsManager { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + protected Dictionary m_nameRequestCache = new Dictionary(); public IUserService UserService { get { return m_userService; } } - protected IUserService m_userService; + protected IUserService m_userService; public IGridServices GridService { get { return m_gridService; } } - protected IGridServices m_gridService; - + protected IGridServices m_gridService; + public IInterRegionCommunications InterRegion { get { return m_interRegion; } } - protected IInterRegionCommunications m_interRegion; + protected IInterRegionCommunications m_interRegion; public UserProfileCacheService UserProfileCacheService { @@ -68,36 +68,36 @@ namespace OpenSim.Framework.Communications } protected UserProfileCacheService m_userProfileCacheService; - // protected AgentAssetTransactionsManager m_transactionsManager; + // protected AgentAssetTransactionsManager m_transactionsManager; - // public AgentAssetTransactionsManager TransactionsManager - // { - // get { return m_transactionsManager; } - // } + // public AgentAssetTransactionsManager TransactionsManager + // { + // get { return m_transactionsManager; } + // } public IAvatarService AvatarService { get { return m_avatarService; } } - protected IAvatarService m_avatarService; + protected IAvatarService m_avatarService; public AssetCache AssetCache { get { return m_assetCache; } } - protected AssetCache m_assetCache; - + protected AssetCache m_assetCache; + public IInterServiceInventoryServices InterServiceInventoryService { get { return m_interServiceInventoryService; } - } + } protected IInterServiceInventoryServices m_interServiceInventoryService; public NetworkServersInfo NetworkServersInfo { get { return m_networkServersInfo; } } - protected NetworkServersInfo m_networkServersInfo; + protected NetworkServersInfo m_networkServersInfo; /// /// Constructor @@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications return null; } } - + public IInventoryServices InventoryService { get diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs index 509f408..fcc0db5 100644 --- a/OpenSim/Framework/Communications/IGridServices.cs +++ b/OpenSim/Framework/Communications/IGridServices.cs @@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications public interface IGridServices { string gdebugRegionName { get; set; } - + /// /// Register a region with the grid service. /// @@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications /// /// Thrown if region registration failed RegionCommsListener RegisterRegion(RegionInfo regionInfos); - + bool DeregisterRegion(RegionInfo regionInfo); /// @@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications /// /// List RequestNeighbours(uint x, uint y); - + RegionInfo RequestNeighbourInfo(ulong regionHandle); RegionInfo RequestNeighbourInfo(LLUUID regionID); RegionInfo RequestClosestRegion(string regionName); diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs index 24213f2..a1f4c2e 100644 --- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs @@ -32,22 +32,22 @@ namespace OpenSim.Framework.Communications { /// /// Inventory operations used between grid services. - /// + /// public interface IInterServiceInventoryServices - { + { /// /// Create a new inventory for the given user. /// /// /// true if the inventory was successfully created, false otherwise bool CreateNewUserInventory(LLUUID user); - + /// /// Returns a list of all the folders in a given user's inventory. /// /// /// A flat list of the user's inventory folder tree, /// null if there is no inventory for this user - List GetInventorySkeleton(LLUUID userId); + List GetInventorySkeleton(LLUUID userId); } } diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index 08a2c5f..b00b1bf 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs @@ -41,12 +41,12 @@ namespace OpenSim.Framework.Communications /// Defines all the operations one can perform on a user's inventory. /// public interface IInventoryServices - { + { string Host { get; } - + /// /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the /// inventory has been received diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs index 3608c56..bd962d1 100644 --- a/OpenSim/Framework/Communications/ISecureInventoryService.cs +++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs @@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications { get; } - + /// /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the /// inventory has been received @@ -102,14 +102,14 @@ namespace OpenSim.Framework.Communications /// Does the given user have an inventory structure? /// /// - /// + /// bool HasInventoryForUser(LLUUID userID); - + /// /// Retrieve the root inventory folder for the given user. /// /// /// null if no root folder was found - InventoryFolderBase RequestRootFolder(LLUUID userID); + InventoryFolderBase RequestRootFolder(LLUUID userID); } } diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 40701f0..c76c078 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs @@ -53,14 +53,14 @@ namespace OpenSim.Framework.Communications /// The filename to the user server plugin DLL public void AddPlugin(string provider, string connect) { - PluginLoader loader = + PluginLoader loader = new PluginLoader (new InventoryDataInitialiser (connect)); - // loader will try to load all providers (MySQL, MSSQL, etc) + // loader will try to load all providers (MySQL, MSSQL, etc) // unless it is constrainted to the correct "Provider" entry in the addin.xml loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); loader.Load(); - + m_plugins = loader.Plugins; } diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index fd5f139..40064d3 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -79,7 +79,7 @@ namespace OpenSim.Framework.Communications /// The existing response /// The user profile public abstract void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest); - + /// /// If the user is already logged in, try to notify the region that the user they've got is dead. /// @@ -206,12 +206,11 @@ namespace OpenSim.Framework.Communications userProfile.CurrentAgent.AgentOnline = false; m_userManager.CommitAgent(ref userProfile); - + // try to tell the region that their user is dead. LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location"); - + // Reject the login - m_log.InfoFormat( "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", @@ -293,7 +292,7 @@ namespace OpenSim.Framework.Communications //return logResponse.ToXmlRpcResponse(); } - userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; + userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; CommitAgent(ref userProfile); // If we reach this point, then the login has successfully logged onto the grid diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index f477df4..feeb666 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -57,11 +57,11 @@ namespace OpenSim.Framework.Communications PluginLoader loader = new PluginLoader (new UserDataInitialiser (connect)); - // loader will try to load all providers (MySQL, MSSQL, etc) + // loader will try to load all providers (MySQL, MSSQL, etc) // unless it is constrainted to the correct "Provider" entry in the addin.xml loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); loader.Load(); - + _plugins = loader.Plugins; } diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 2154e1e..89f52cf 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs @@ -46,7 +46,7 @@ namespace OpenSim.Framework.Configuration.XML private void LoadDataToClass() { - rootNode = doc.SelectSingleNode("Root"); + rootNode = doc.SelectSingleNode("Root"); if (null == rootNode) throw new Exception("Error: Invalid .xml File. Missing "); @@ -135,4 +135,4 @@ namespace OpenSim.Framework.Configuration.XML doc = null; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index f21127b..89fd77d 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs @@ -42,7 +42,7 @@ namespace OpenSim.Framework.Console private readonly object m_syncRoot = new object(); public conscmd_callback m_cmdParser; - + /// /// The default prompt text. /// @@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console { line = System.Console.ReadLine(); } - + return line; } catch (Exception e) diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs index b3f1c93..bf70645 100644 --- a/OpenSim/Framework/Console/ConsolePluginCommand.cs +++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs @@ -30,10 +30,10 @@ using System; namespace OpenSim.Framework.Console { public delegate void ConsoleCommand(string[] comParams); - + /// /// Holder object for a new console plugin command - /// + /// /// Override the methods like Run and IsHelpfull (but the defaults might work ok.) /// public class ConsolePluginCommand @@ -52,10 +52,10 @@ namespace OpenSim.Framework.Console private string[] m_cmdText; /// - /// Construct a new ConsolePluginCommand - /// + /// Construct a new ConsolePluginCommand + /// /// for use with OpenSim.RegisterConsolePluginCommand(myCmd); - /// + /// /// /// in the form of "showme new commands" /// ommand delegate used in running @@ -68,13 +68,13 @@ namespace OpenSim.Framework.Console } /// - /// Returns the match length this command has upon the 'cmdWithParams' + /// Returns the match length this command has upon the 'cmdWithParams' /// At least a higher number for "show plugin status" then "show" would return /// This is used to have multi length command verbs - /// + /// /// @see OopenSim.RunPluginCommands /// It will only run the one with the highest number - /// + /// /// public int matchLength(string cmdWithParams) { @@ -106,8 +106,8 @@ namespace OpenSim.Framework.Console } currentParam++; } - - } + + } string[] sendCmdParams = cmdParams; if (skipParams > 0) { diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index 2527977..fa26d22 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs @@ -39,7 +39,7 @@ namespace OpenSim.Framework.Console { override protected void Append(LoggingEvent le) { - try + try { string loggingMessage = RenderLoggingEvent(le); @@ -47,7 +47,7 @@ namespace OpenSim.Framework.Console Regex RE = new Regex(regex, RegexOptions.Multiline); MatchCollection matches = RE.Matches(loggingMessage); - + // Get some direct matches $1 $4 is a if (matches.Count == 1) { diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs index 00d290e..ec70554 100644 --- a/OpenSim/Framework/IAssetProvider.cs +++ b/OpenSim/Framework/IAssetProvider.cs @@ -37,7 +37,7 @@ namespace OpenSim.Framework bool ExistsAsset(LLUUID uuid); void Initialise(string connect); } - + public class AssetDataInitialiser : PluginInitialiserBase { private string connect; diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 536050c..71b8eb0 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs @@ -62,7 +62,7 @@ namespace OpenSim.Framework public delegate void ModifyTerrain( float height, float seconds, byte size, byte action, float north, float west, float south, float east, IClientAPI remoteClient); - + public delegate void SetAppearance(byte[] texture, List visualParamList); public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID); @@ -295,7 +295,7 @@ namespace OpenSim.Framework public delegate void EstateTeleportOneUserHomeRequest(IClientAPI remoteClient, LLUUID invoice, LLUUID senderID, LLUUID prey); public delegate void RegionHandleRequest(IClientAPI remoteClient, LLUUID regionID); public delegate void ParcelInfoRequest(IClientAPI remoteClient, LLUUID parcelID); - + public delegate void ScriptReset(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); public delegate void GetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID); public delegate void SetScriptRunning(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, bool running); @@ -322,9 +322,9 @@ namespace OpenSim.Framework ulong ActiveGroupPowers { get; } ulong GetGroupPowers(LLUUID groupID); - + string FirstName { get; } - + string LastName { get; } IScene Scene { get; } @@ -501,7 +501,7 @@ namespace OpenSim.Framework event EstateDebugRegionRequest OnEstateDebugRegionRequest; event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; event UUIDNameRequest OnUUIDGroupNameRequest; - + event RegionHandleRequest OnRegionHandleRequest; event ParcelInfoRequest OnParcelInfoRequest; @@ -724,10 +724,10 @@ namespace OpenSim.Framework ClientInfo GetClientInfo(); void SetClientInfo(ClientInfo info); void Terminate(); - + void SendSetFollowCamProperties(LLUUID objectID, SortedDictionary parameters); void SendClearFollowCamProperties(LLUUID objectID); - + void SendRegionHandle(LLUUID regoinID, ulong handle); void SendParcelInfo(RegionInfo info, LandData land, LLUUID parcelID, uint x, uint y); } diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs index 0d4c555..1c62b0b 100644 --- a/OpenSim/Framework/IInventoryData.cs +++ b/OpenSim/Framework/IInventoryData.cs @@ -132,7 +132,7 @@ namespace OpenSim.Framework /// The id of the folder void deleteInventoryFolder(LLUUID folder); } - + public class InventoryDataInitialiser : PluginInitialiserBase { private string connect; diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs index f739177..1eb1c06 100644 --- a/OpenSim/Framework/IPlugin.cs +++ b/OpenSim/Framework/IPlugin.cs @@ -38,7 +38,7 @@ namespace OpenSim.Framework public PluginNotInitialisedException (string msg) : base(msg) {} public PluginNotInitialisedException (string msg, Exception e) : base(msg, e) {} } - + /// /// This interface, describes a generic plugin /// @@ -63,17 +63,17 @@ namespace OpenSim.Framework } /// - /// Any plugins which need to pass parameters to their initialisers must + /// Any plugins which need to pass parameters to their initialisers must /// inherit this class and use it to set the PluginLoader Initialiser property /// public class PluginInitialiserBase { // this would be a lot simpler if C# supported currying or typedefs - + // default initialisation public virtual void Initialise (IPlugin plugin) { - plugin.Initialise(); + plugin.Initialise(); } } diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs index 5ecb482..f74c0db 100644 --- a/OpenSim/Framework/IUserData.cs +++ b/OpenSim/Framework/IUserData.cs @@ -170,7 +170,7 @@ namespace OpenSim.Framework void RemoveAttachment(LLUUID user, LLUUID item); List GetAttachments(LLUUID user); } - + public class UserDataInitialiser : PluginInitialiserBase { private string connect; diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs index 8c1e1a1..a875a50 100644 --- a/OpenSim/Framework/LandData.cs +++ b/OpenSim/Framework/LandData.cs @@ -39,7 +39,7 @@ namespace OpenSim.Framework private uint _auctionID = 0; //Unemplemented. If set to 0, not being auctioned private LLUUID _authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID private Parcel.ParcelCategory _category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category - private int _claimDate = 0; + private int _claimDate = 0; private int _claimPrice = 0; //Unemplemented private LLUUID _globalID = LLUUID.Zero; private LLUUID _groupID = LLUUID.Zero; //Unemplemented @@ -77,7 +77,7 @@ namespace OpenSim.Framework private LLUUID _snapshotID = LLUUID.Zero; private LLVector3 _userLocation = new LLVector3(); private LLVector3 _userLookAt = new LLVector3(); - + public LLVector3 AABBMax { get { return _AABBMax; @@ -459,4 +459,4 @@ namespace OpenSim.Framework return landData; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/LandStatReportItem.cs b/OpenSim/Framework/LandStatReportItem.cs index 3a92253..8c7ee7b 100644 --- a/OpenSim/Framework/LandStatReportItem.cs +++ b/OpenSim/Framework/LandStatReportItem.cs @@ -49,6 +49,6 @@ namespace OpenSim.Framework { } - + } } diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index 7ceb0b2..cabce1b 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs @@ -47,7 +47,7 @@ namespace OpenSim.Framework } /// - /// Classes wishing to impose constraints on plugin loading must implement + /// Classes wishing to impose constraints on plugin loading must implement /// this class and pass it to PluginLoader AddConstraint() /// public interface IPluginConstraint @@ -75,46 +75,46 @@ namespace OpenSim.Framework private List loaded = new List(); private List extpoints = new List(); private PluginInitialiserBase initialiser; - - private Dictionary constraints + + private Dictionary constraints = new Dictionary(); - private Dictionary filters + private Dictionary filters = new Dictionary(); - private static readonly ILog log + private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public PluginInitialiserBase Initialiser - { - set { initialiser = value; } - get { return initialiser; } + { + set { initialiser = value; } + get { return initialiser; } } - public List Plugins - { - get { return loaded; } + public List Plugins + { + get { return loaded; } } public T Plugin - { - get { return (loaded.Count == 1)? loaded [0] : default (T); } + { + get { return (loaded.Count == 1)? loaded [0] : default (T); } } - public PluginLoader () + public PluginLoader () { Initialiser = new PluginInitialiserBase(); initialise_plugin_dir_ ("."); } public PluginLoader (PluginInitialiserBase init) - { + { Initialiser = init; initialise_plugin_dir_ ("."); } public PluginLoader (PluginInitialiserBase init, string dir) - { + { Initialiser = init; initialise_plugin_dir_ (dir); } @@ -123,7 +123,7 @@ namespace OpenSim.Framework { if (extpoints.Contains (extpoint)) return; - + extpoints.Add (extpoint); } @@ -156,7 +156,7 @@ namespace OpenSim.Framework } public void Load () - { + { foreach (string ext in extpoints) { log.Info("[PLUGINS]: Loading extension point " + ext); @@ -169,17 +169,17 @@ namespace OpenSim.Framework } IPluginFilter filter = null; - + if (filters.ContainsKey (ext)) filter = filters [ext]; foreach (PluginExtensionNode node in AddinManager.GetExtensionNodes (ext)) { log.Info("[PLUGINS]: Trying plugin " + node.Path); - + if ((filter != null) && (filter.Apply (node) == false)) continue; - + T plugin = (T) node.CreateInstance(); Initialiser.Initialise (plugin); Plugins.Add (plugin); @@ -219,7 +219,7 @@ namespace OpenSim.Framework private void on_addinloaderror_(object sender, AddinErrorEventArgs args) { if (args.Exception == null) - log.Error ("[PLUGINS]: Plugin Error: " + log.Error ("[PLUGINS]: Plugin Error: " + args.Message); else log.Error ("[PLUGINS]: Plugin Error: " @@ -229,7 +229,7 @@ namespace OpenSim.Framework private void clear_registry_ () { - // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) + // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) // occasionally seems to corrupt its addin cache // Hence, as a temporary solution we'll remove it before each startup try @@ -252,7 +252,7 @@ namespace OpenSim.Framework } } - private static TextWriter prev_console_; + private static TextWriter prev_console_; public void suppress_console_output_ (bool save) { if (save) @@ -262,7 +262,7 @@ namespace OpenSim.Framework } else { - if (prev_console_ != null) + if (prev_console_ != null) System.Console.SetOut(prev_console_); } } @@ -283,7 +283,7 @@ namespace OpenSim.Framework public Type TypeObject { - get + get { if (typeobj != null) return typeobj; @@ -295,9 +295,9 @@ namespace OpenSim.Framework } } - public object CreateInstance () - { - return Activator.CreateInstance (TypeObject); + public object CreateInstance () + { + return Activator.CreateInstance (TypeObject); } } @@ -305,29 +305,29 @@ namespace OpenSim.Framework /// Constraint that bounds the number of plugins to be loaded. /// public class PluginCountConstraint : IPluginConstraint - { - private int min; - private int max; + { + private int min; + private int max; public PluginCountConstraint (int exact) { - min = exact; - max = exact; + min = exact; + max = exact; + } + + public PluginCountConstraint (int minimum, int maximum) + { + min = minimum; + max = maximum; } - public PluginCountConstraint (int minimum, int maximum) - { - min = minimum; - max = maximum; - } - - public string Message - { - get - { - return "The number of plugins is constrained to the interval [" - + min + ", " + max + "]"; - } + public string Message + { + get + { + return "The number of plugins is constrained to the interval [" + + min + ", " + max + "]"; + } } public bool Apply (string extpoint) @@ -340,7 +340,7 @@ namespace OpenSim.Framework return true; } } - + /// /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml /// @@ -348,7 +348,7 @@ namespace OpenSim.Framework { private string provider; - public PluginProviderFilter (string p) + public PluginProviderFilter (string p) { provider = p; } diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index ef74b54..f244b51 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -128,7 +128,7 @@ namespace OpenSim.Framework [XmlIgnore] private bool _flexiEntry = false; [XmlIgnore] private bool _lightEntry = false; [XmlIgnore] private bool _sculptEntry = false; - + public byte ProfileCurve { get { return (byte)((byte)HollowShape | (byte)ProfileShape); } @@ -185,10 +185,10 @@ namespace OpenSim.Framework [XmlIgnore] public LLObject.TextureEntry Textures { - get - { + get + { //m_log.DebugFormat("[PRIMITIVE BASE SHAPE]: get m_textureEntry length {0}", m_textureEntry.Length); - return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); + return new LLObject.TextureEntry(m_textureEntry, 0, m_textureEntry.Length); } set { m_textureEntry = value.ToBytes(); } @@ -198,12 +198,12 @@ namespace OpenSim.Framework { get { return m_textureEntry; } - set - { - if (value == null) + set + { + if (value == null) m_textureEntry = new byte[1]; - else - m_textureEntry = value; + else + m_textureEntry = value; } } @@ -302,7 +302,7 @@ namespace OpenSim.Framework _profileBegin = LLObject.PackBeginCut(profileRange.X); _profileEnd = LLObject.PackEndCut(profileRange.Y); } - + public byte[] ExtraParams { get @@ -941,7 +941,7 @@ namespace OpenSim.Framework return data; } - + public void ReadFlexiData(byte[] data, int pos) { if (data.Length-pos >= 16) @@ -972,7 +972,7 @@ namespace OpenSim.Framework _flexiForceZ = 0f; } } - + public byte[] GetFlexiBytes() { byte[] data = new byte[16]; @@ -991,7 +991,7 @@ namespace OpenSim.Framework return data; } - + public void ReadLightData(byte[] data, int pos) { if (data.Length - pos >= 16) @@ -1021,7 +1021,7 @@ namespace OpenSim.Framework _lightIntensity = 0f; } } - + public byte[] GetLightBytes() { byte[] data = new byte[16]; diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs index 0b50a81..2d0be15 100644 --- a/OpenSim/Framework/RegionCommsListener.cs +++ b/OpenSim/Framework/RegionCommsListener.cs @@ -47,7 +47,7 @@ namespace OpenSim.Framework private RegionUp handlerRegionUp = null; // OnRegionUp; private LogOffUser handlerLogOffUser = null; private GetLandData handlerGetLandData = null; - + #region IRegionCommsListener Members public event ExpectUserDelegate OnExpectUser; @@ -228,13 +228,13 @@ namespace OpenSim.Framework return false; } - + public LandData TriggerGetLandData(uint x, uint y) { handlerGetLandData = OnGetLandData; if (handlerGetLandData != null) return handlerGetLandData(x, y); - + return null; } } diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 1d9d9ec..716849c 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -50,7 +50,7 @@ namespace OpenSim.Framework set { m_httpPort = value; } } protected uint m_httpPort; - + /// /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) /// @@ -58,17 +58,17 @@ namespace OpenSim.Framework { get { return m_serverURI; } set { m_serverURI = value; } - } + } protected string m_serverURI; protected bool Allow_Alternate_Ports; public bool m_allow_alternate_ports; protected string m_externalHostName; - + protected IPEndPoint m_internalEndPoint; protected uint? m_regionLocX; protected uint? m_regionLocY; - protected uint m_remotingPort; + protected uint m_remotingPort; public LLUUID RegionID = LLUUID.Zero; public string RemotingAddress; @@ -404,11 +404,11 @@ namespace OpenSim.Framework configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", MasterAvatarSandboxPassword, true); - configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, + configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Last Map UUID", lastMapUUID.ToString(), true); - configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, + configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); - + } public void loadConfigurationOptions() @@ -454,15 +454,14 @@ namespace OpenSim.Framework shouldMasterAvatarDetailsBeAsked); configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Last Map UUID", lastMapUUID.ToString(), true); - - configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, + + configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true); - } public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) { - if (MasterAvatarAssignedUUID == LLUUID.Zero) + return MasterAvatarAssignedUUID == LLUUID.Zero; { return true; } diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index d157bac..b6e466d 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs @@ -139,7 +139,7 @@ namespace OpenSim.Framework { case "region_flags": Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; - + m_BlockTerraform = (flags & Simulator.RegionFlags.BlockTerraform) != 0; m_BlockFly = @@ -246,7 +246,7 @@ namespace OpenSim.Framework } private bool m_BlockTerraform = false; - + public bool BlockTerraform { get { return m_BlockTerraform; } @@ -254,7 +254,7 @@ namespace OpenSim.Framework } private bool m_BlockFly = false; - + public bool BlockFly { get { return m_BlockFly; } @@ -262,7 +262,7 @@ namespace OpenSim.Framework } private bool m_AllowDamage = false; - + public bool AllowDamage { get { return m_AllowDamage; } @@ -270,7 +270,7 @@ namespace OpenSim.Framework } private bool m_RestrictPushing = false; - + public bool RestrictPushing { get { return m_RestrictPushing; } @@ -278,7 +278,7 @@ namespace OpenSim.Framework } private bool m_AllowLandResell = true; - + public bool AllowLandResell { get { return m_AllowLandResell; } @@ -286,7 +286,7 @@ namespace OpenSim.Framework } private bool m_AllowLandJoinDivide = true; - + public bool AllowLandJoinDivide { get { return m_AllowLandJoinDivide; } @@ -294,7 +294,7 @@ namespace OpenSim.Framework } private bool m_BlockShowInSearch = false; - + public bool BlockShowInSearch { get { return m_BlockShowInSearch; } @@ -302,7 +302,7 @@ namespace OpenSim.Framework } private int m_AgentLimit = 40; - + public int AgentLimit { get { return m_AgentLimit; } @@ -310,7 +310,7 @@ namespace OpenSim.Framework } private double m_ObjectBonus = 1.0; - + public double ObjectBonus { get { return m_ObjectBonus; } @@ -318,7 +318,7 @@ namespace OpenSim.Framework } private int m_Maturity = 1; - + public int Maturity { get { return m_Maturity; } @@ -326,7 +326,7 @@ namespace OpenSim.Framework } private bool m_DisableScripts = false; - + public bool DisableScripts { get { return m_DisableScripts; } @@ -334,7 +334,7 @@ namespace OpenSim.Framework } private bool m_DisableCollisions = false; - + public bool DisableCollisions { get { return m_DisableCollisions; } @@ -342,7 +342,7 @@ namespace OpenSim.Framework } private bool m_DisablePhysics = false; - + public bool DisablePhysics { get { return m_DisablePhysics; } @@ -350,7 +350,7 @@ namespace OpenSim.Framework } private LLUUID m_TerrainTexture1 = LLUUID.Zero; - + public LLUUID TerrainTexture1 { get { return m_TerrainTexture1; } @@ -358,7 +358,7 @@ namespace OpenSim.Framework } private LLUUID m_TerrainTexture2 = LLUUID.Zero; - + public LLUUID TerrainTexture2 { get { return m_TerrainTexture2; } @@ -366,7 +366,7 @@ namespace OpenSim.Framework } private LLUUID m_TerrainTexture3 = LLUUID.Zero; - + public LLUUID TerrainTexture3 { get { return m_TerrainTexture3; } @@ -374,7 +374,7 @@ namespace OpenSim.Framework } private LLUUID m_TerrainTexture4 = LLUUID.Zero; - + public LLUUID TerrainTexture4 { get { return m_TerrainTexture4; } @@ -382,7 +382,7 @@ namespace OpenSim.Framework } private double m_Elevation1NW = 10; - + public double Elevation1NW { get { return m_Elevation1NW; } @@ -390,7 +390,7 @@ namespace OpenSim.Framework } private double m_Elevation2NW = 60; - + public double Elevation2NW { get { return m_Elevation2NW; } @@ -398,7 +398,7 @@ namespace OpenSim.Framework } private double m_Elevation1NE = 10; - + public double Elevation1NE { get { return m_Elevation1NE; } @@ -406,7 +406,7 @@ namespace OpenSim.Framework } private double m_Elevation2NE = 60; - + public double Elevation2NE { get { return m_Elevation2NE; } @@ -414,7 +414,7 @@ namespace OpenSim.Framework } private double m_Elevation1SE = 10; - + public double Elevation1SE { get { return m_Elevation1SE; } @@ -422,7 +422,7 @@ namespace OpenSim.Framework } private double m_Elevation2SE = 60; - + public double Elevation2SE { get { return m_Elevation2SE; } @@ -430,7 +430,7 @@ namespace OpenSim.Framework } private double m_Elevation1SW = 10; - + public double Elevation1SW { get { return m_Elevation1SW; } @@ -438,7 +438,7 @@ namespace OpenSim.Framework } private double m_Elevation2SW = 60; - + public double Elevation2SW { get { return m_Elevation2SW; } @@ -446,7 +446,7 @@ namespace OpenSim.Framework } private double m_WaterHeight = 20; - + public double WaterHeight { get { return m_WaterHeight; } @@ -454,7 +454,7 @@ namespace OpenSim.Framework } private double m_TerrainRaiseLimit = 100; - + public double TerrainRaiseLimit { get { return m_TerrainRaiseLimit; } @@ -462,7 +462,7 @@ namespace OpenSim.Framework } private double m_TerrainLowerLimit = -100; - + public double TerrainLowerLimit { get { return m_TerrainLowerLimit; } @@ -470,7 +470,7 @@ namespace OpenSim.Framework } private bool m_UseEstateSun = true; - + public bool UseEstateSun { get { return m_UseEstateSun; } @@ -478,7 +478,7 @@ namespace OpenSim.Framework } private bool m_Sandbox = false; - + public bool Sandbox { get { return m_Sandbox; } @@ -502,7 +502,7 @@ namespace OpenSim.Framework } private bool m_FixedSun = false; - + public bool FixedSun { get { return m_FixedSun; } @@ -510,7 +510,7 @@ namespace OpenSim.Framework } private double m_SunPosition = 0.0; - + public double SunPosition { get { return m_SunPosition; } @@ -518,7 +518,7 @@ namespace OpenSim.Framework } private LLUUID m_Covenant = LLUUID.Zero; - + public LLUUID Covenant { get { return m_Covenant; } diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 952fb31..c3bd085 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs @@ -172,7 +172,7 @@ namespace OpenSim.Framework.Servers OSHttpResponse response = new OSHttpResponse(context.Response); // This is the REST agent interface. We require an agent to properly identify - // itself. If the REST handler recognizes the prefix it will attempt to + // itself. If the REST handler recognizes the prefix it will attempt to // satisfy the request. If it is not recognizable, and no damage has occurred // the request can be passed through to the other handlers. This is a low // probability event; if a request is matched it is normally expected to be @@ -650,7 +650,7 @@ namespace OpenSim.Framework.Servers } response.AddHeader("Content-type", contentType); - + byte[] buffer; if (!contentType.Contains("image")) diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index e901b68..33081b9 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs @@ -89,7 +89,7 @@ namespace OpenSim.Framework.Servers m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics); m_periodicDiagnosticsTimer.Enabled = true; - + // Add ourselves to thread monitoring. This thread will go on to become the console listening thread Thread.CurrentThread.Name = "ConsoleThread"; ThreadTracker.Add(Thread.CurrentThread); @@ -102,15 +102,15 @@ namespace OpenSim.Framework.Servers { StringBuilder sb = new StringBuilder("DIAGNOSTICS\n\n"); sb.Append(GetUptimeReport()); - + if (m_stats != null) { sb.Append(m_stats.Report()); } - + m_log.Debug(sb); } - + /// /// Return a report about the uptime of this server /// @@ -120,10 +120,10 @@ namespace OpenSim.Framework.Servers StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now)); sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime)); sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime)); - + return sb.ToString(); } - + /// /// Set the level of log notices being echoed to the console /// @@ -133,7 +133,7 @@ namespace OpenSim.Framework.Servers ILoggerRepository repository = LogManager.GetRepository(); IAppender[] appenders = repository.GetAppenders(); OpenSimAppender consoleAppender = null; - + foreach (IAppender appender in appenders) { if (appender.Name == "Console") @@ -142,13 +142,13 @@ namespace OpenSim.Framework.Servers break; } } - + if (null == consoleAppender) { Notice("No appender named Console found (see the log4net config file for this executable)!"); return; } - + if (setParams.Length > 0) { Level consoleLevel = repository.LevelMap[setParams[0]]; @@ -160,12 +160,12 @@ namespace OpenSim.Framework.Servers "{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF", setParams[0])); } - + // If there is no threshold set then the threshold is effectively everything. Level thresholdLevel = (null != consoleAppender.Threshold ? consoleAppender.Threshold : log4net.Core.Level.All); - - Notice(String.Format("Console log level is {0}", thresholdLevel)); + + Notice(String.Format("Console log level is {0}", thresholdLevel)); } /// @@ -203,7 +203,7 @@ namespace OpenSim.Framework.Servers Notice(""); Notice("quit - equivalent to shutdown."); - Notice("set log level [level] - change the console logging level only. For example, off or debug."); + Notice("set log level [level] - change the console logging level only. For example, off or debug."); Notice("show info - show server information (e.g. startup path)."); if (m_stats != null) @@ -219,7 +219,7 @@ namespace OpenSim.Framework.Servers case "set": Set(cmdparams); break; - + case "show": if (cmdparams.Length > 0) { @@ -232,8 +232,8 @@ namespace OpenSim.Framework.Servers Shutdown(); break; } - } - + } + /// /// Set an OpenSim parameter /// @@ -245,15 +245,15 @@ namespace OpenSim.Framework.Servers // Temporary while we only have one command which takes at least two parameters if (setArgs.Length < 2) return; - + if (setArgs[0] == "log" && setArgs[1] == "level") { string[] setParams = new string[setArgs.Length - 2]; Array.Copy(setArgs, 2, setParams, 0, setArgs.Length - 2); - - SetConsoleLogLevel(setParams); + + SetConsoleLogLevel(setParams); } - } + } /// /// Outputs to the console information about the region @@ -276,7 +276,7 @@ namespace OpenSim.Framework.Servers Notice(m_stats.Report()); } break; - + case "threads": List threads = ThreadTracker.GetThreads(); if (threads == null) @@ -291,7 +291,7 @@ namespace OpenSim.Framework.Servers Notice("ID: " + t.ManagedThreadId.ToString() + ", Name: " + t.Name + ", Alive: " + t.IsAlive.ToString() + ", Pri: " + t.Priority.ToString() + ", State: " + t.ThreadState.ToString()); } } - break; + break; case "uptime": Notice(GetUptimeReport()); @@ -301,7 +301,7 @@ namespace OpenSim.Framework.Servers Notice("Version: " + m_version); break; } - } + } /// /// Console output is only possible if a console has been established. diff --git a/OpenSim/Framework/Servers/OSHttpHandler.cs b/OpenSim/Framework/Servers/OSHttpHandler.cs index 66fff3e..838f29a 100644 --- a/OpenSim/Framework/Servers/OSHttpHandler.cs +++ b/OpenSim/Framework/Servers/OSHttpHandler.cs @@ -72,21 +72,21 @@ namespace OpenSim.Framework.Servers /// Regular expression used to match against method of /// the incoming HTTP request. If you want to match any string /// either use '.*' or null. To match on the empty string use - /// '^$'. + /// '^$'. /// public virtual Regex Method { get { return _method; } } protected Regex _method; - + /// /// Regular expression used to match against path of the /// incoming HTTP request. If you want to match any string /// either use '.*' or null. To match on the emtpy string use /// '^$'. /// - public virtual Regex Path + public virtual Regex Path { get { return _path; } } @@ -97,7 +97,7 @@ namespace OpenSim.Framework.Servers /// allowing us to match on URI query fields. /// public virtual Dictionary Query - { + { get { return _query; } } protected Dictionary _query; @@ -107,7 +107,7 @@ namespace OpenSim.Framework.Servers /// allowing us to match on HTTP header fields. /// public virtual Dictionary Headers - { + { get { return _headers; } } protected Dictionary _headers; @@ -137,7 +137,7 @@ namespace OpenSim.Framework.Servers /// null or content type /// regex /// null or IP address regex - public OSHttpHandler(Regex method, Regex path, Dictionary query, + public OSHttpHandler(Regex method, Regex path, Dictionary query, Dictionary headers, Regex contentType, Regex whitelist) { _method = method; @@ -155,7 +155,7 @@ namespace OpenSim.Framework.Servers /// /// Process an incoming OSHttpRequest that matched our - /// requirements. + /// requirements. /// /// /// OSHttpHandlerResult.Pass if we are after all not @@ -180,4 +180,4 @@ namespace OpenSim.Framework.Servers return sw.ToString(); } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Servers/OSHttpHttpHandler.cs b/OpenSim/Framework/Servers/OSHttpHttpHandler.cs index 66120c3..e08df85 100644 --- a/OpenSim/Framework/Servers/OSHttpHttpHandler.cs +++ b/OpenSim/Framework/Servers/OSHttpHttpHandler.cs @@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers /// null or dictionary with header /// regexs /// null or IP address whitelist - public OSHttpHttpHandler(GenericHTTPMethod handler, Regex method, Regex path, + public OSHttpHttpHandler(GenericHTTPMethod handler, Regex method, Regex path, Dictionary query, Dictionary headers, Regex whitelist) : base(method, path, query, headers, new Regex(@"^text/html", RegexOptions.IgnoreCase | RegexOptions.Compiled), @@ -71,7 +71,7 @@ namespace OpenSim.Framework.Servers /// Instantiate an HTTP handler. /// /// a GenericHTTPMethod - public OSHttpHttpHandler(GenericHTTPMethod handler) + public OSHttpHttpHandler(GenericHTTPMethod handler) : this(handler, new Regex(@"^GET$", RegexOptions.IgnoreCase | RegexOptions.Compiled), null, null, null, null) { } @@ -79,7 +79,7 @@ namespace OpenSim.Framework.Servers /// /// Invoked by OSHttpRequestPump. /// - public override OSHttpHandlerResult Process(OSHttpRequest request) + public override OSHttpHandlerResult Process(OSHttpRequest request) { // call handler method Hashtable responseData = _handler(request.Query); @@ -110,7 +110,7 @@ namespace OpenSim.Framework.Servers } response.AddHeader("Content-type", contentType); - + byte[] buffer; if (!contentType.Contains("image")) @@ -142,4 +142,4 @@ namespace OpenSim.Framework.Servers return OSHttpHandlerResult.Done; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Servers/OSHttpRequest.cs b/OpenSim/Framework/Servers/OSHttpRequest.cs index 0a82a04..01e71c8 100644 --- a/OpenSim/Framework/Servers/OSHttpRequest.cs +++ b/OpenSim/Framework/Servers/OSHttpRequest.cs @@ -38,42 +38,35 @@ namespace OpenSim.Framework.Servers { public class OSHttpRequest { - - public string[] AcceptTypes { get { return _acceptTypes; } } private string[] _acceptTypes; - public Encoding ContentEncoding { get { return _contentEncoding; } } private Encoding _contentEncoding; - public long ContentLength { get { return _contentLength64; } } private long _contentLength64; - public long ContentLength64 { get { return ContentLength; } } - public string ContentType { get { return _contentType; } } private string _contentType; - // public CookieCollection Cookies // { // get { return _cookies; } @@ -92,63 +85,54 @@ namespace OpenSim.Framework.Servers } private string _httpMethod; - public Stream InputStream { get { return _inputStream; } } private Stream _inputStream; - // public bool IsSecureConnection // { // get { return _isSecureConnection; } // } // private bool _isSecureConnection; - // public bool IsAuthenticated // { // get { return _isAuthenticated; } // } // private bool _isAuthenticated; - public bool HasEntityBody { get { return _hasbody; } } private bool _hasbody; - public bool KeepAlive { get { return _keepAlive; } } private bool _keepAlive; - public string RawUrl { get { return _rawUrl; } } private string _rawUrl; - public Uri Url { get { return _url; } } private Uri _url; - public string UserAgent { get { return _userAgent; } } private string _userAgent; - public NameValueCollection QueryString { get { return _queryString; } @@ -161,28 +145,24 @@ namespace OpenSim.Framework.Servers } private Hashtable _query; - public IPEndPoint RemoteIPEndPoint { get { return _ipEndPoint; } } private IPEndPoint _ipEndPoint; - internal HttpRequest HttpRequest { get { return _request; } } private HttpRequest _request; - internal HttpClientContext HttpClientContext { get { return _context; } } private HttpClientContext _context; - /// /// Internal whiteboard for handlers to store temporary stuff /// into. @@ -193,12 +173,10 @@ namespace OpenSim.Framework.Servers } private Dictionary _whiteboard = new Dictionary(); - public OSHttpRequest() { } - public OSHttpRequest(HttpListenerRequest req) { _acceptTypes = req.AcceptTypes; diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs index 8d4dc0d..b4270b3 100644 --- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs +++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs @@ -39,7 +39,6 @@ using System.Threading; using log4net; using HttpServer; - namespace OpenSim.Framework.Servers { /// @@ -58,13 +57,12 @@ namespace OpenSim.Framework.Servers protected Thread _engine; private int _id; - + public string EngineID { get { return String.Format("{0} pump {1}", _server.EngineID, _id); } } - public OSHttpRequestPump(OSHttpServer server, OSHttpRequestQueue queue, int id) { _server = server; @@ -77,7 +75,6 @@ namespace OpenSim.Framework.Servers _engine.Start(); ThreadTracker.Add(_engine); - } public static OSHttpRequestPump[] Pumps(OSHttpServer server, OSHttpRequestQueue queue, int poolSize) @@ -104,21 +101,22 @@ namespace OpenSim.Framework.Servers public void Engine() { OSHttpRequest req = null; - + while (true) { - try { + try + { // dequeue an OSHttpRequest from OSHttpServer's - // request queue + // request queue req = _queue.Dequeue(); - + // get a copy of the list of registered handlers List handlers = _server.OSHttpHandlers; - + // prune list and have it sorted from most // specific to least specific handlers = MatchHandlers(req, handlers); - + // process req: we try each handler in turn until // we are either out of handlers or get back a // Pass or Done @@ -126,18 +124,18 @@ namespace OpenSim.Framework.Servers foreach (OSHttpHandler h in handlers) { rc = h.Process(req); - + // Pass: handler did not process the request, // try next handler if (OSHttpHandlerResult.Pass == rc) continue; // Handled: handler has processed the request if (OSHttpHandlerResult.Done == rc) break; - + // hmm, something went wrong throw new Exception(String.Format("[{0}] got unexpected OSHttpHandlerResult {1}", EngineID, rc)); } - + if (OSHttpHandlerResult.Unprocessed == rc) { _log.InfoFormat("[{0}] OSHttpHandler: no handler registered for {1}", EngineID, req); @@ -190,7 +188,7 @@ namespace OpenSim.Framework.Servers if (null != remote) { Match epm = h.IPEndPointWhitelist.Match(remote.ToString()); - if (!epm.Success) + if (!epm.Success) { scoredHandlers.Remove(h); continue; @@ -201,7 +199,7 @@ namespace OpenSim.Framework.Servers if (null != h.Method) { Match m = h.Method.Match(req.HttpMethod); - if (!m.Success) + if (!m.Success) { scoredHandlers.Remove(h); continue; @@ -213,7 +211,7 @@ namespace OpenSim.Framework.Servers if (null != h.Path) { Match m = h.Path.Match(req.RawUrl); - if (!m.Success) + if (!m.Success) { scoredHandlers.Remove(h); continue; @@ -272,14 +270,15 @@ namespace OpenSim.Framework.Servers { return 0; } - + // does the content of collection[tag] match // the supplied regex? Match cm = regexs[tag].Match(collection[tag]); - if (!cm.Success) { + if (!cm.Success) + { return 0; } - + // ok: matches matched++; continue; @@ -288,7 +287,7 @@ namespace OpenSim.Framework.Servers return matched; } - [ConditionalAttribute("DEBUGGING")] + [ConditionalAttribute("DEBUGGING")] private void LogDumpHandlerList(List l) { _log.DebugFormat("[{0}] OSHttpHandlerList dump:", EngineID); diff --git a/OpenSim/Framework/Servers/OSHttpRequestQueue.cs b/OpenSim/Framework/Servers/OSHttpRequestQueue.cs index f6f1829..94f7b32 100644 --- a/OpenSim/Framework/Servers/OSHttpRequestQueue.cs +++ b/OpenSim/Framework/Servers/OSHttpRequestQueue.cs @@ -40,7 +40,7 @@ namespace OpenSim.Framework.Servers { private object _syncObject = new object(); - new public void Enqueue(OSHttpRequest req) + new public void Enqueue(OSHttpRequest req) { lock (_syncObject) { @@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers Monitor.Pulse(_syncObject); } } - + new public OSHttpRequest Dequeue() { OSHttpRequest req = null; @@ -65,4 +65,4 @@ namespace OpenSim.Framework.Servers return req; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Servers/OSHttpResponse.cs b/OpenSim/Framework/Servers/OSHttpResponse.cs index eb7e400..21d1e2b 100644 --- a/OpenSim/Framework/Servers/OSHttpResponse.cs +++ b/OpenSim/Framework/Servers/OSHttpResponse.cs @@ -56,15 +56,15 @@ namespace OpenSim.Framework.Servers /// /// /// Setting this property will also set IsContentTypeSet to - /// true. + /// true. /// public string ContentType { - get - { + get + { if (HttpServer) return _httpResponse.ContentType; - else + else return _httpListenerResponse.ContentType; } set @@ -100,11 +100,11 @@ namespace OpenSim.Framework.Servers /// public long ContentLength { - get - { + get + { if (HttpServer) return _httpResponse.ContentLength; - else + else return _httpListenerResponse.ContentLength64; } set @@ -130,11 +130,11 @@ namespace OpenSim.Framework.Servers /// public Encoding ContentEncoding { - get - { + get + { if (HttpServer) return _httpResponse.Encoding; - else + else return _httpListenerResponse.ContentEncoding; } @@ -142,7 +142,7 @@ namespace OpenSim.Framework.Servers { if (HttpServer) _httpResponse.Encoding = value; - else + else _httpListenerResponse.ContentEncoding = value; } } @@ -152,8 +152,8 @@ namespace OpenSim.Framework.Servers /// public WebHeaderCollection Headers { - get - { + get + { if (HttpServer) return null; else @@ -166,10 +166,10 @@ namespace OpenSim.Framework.Servers /// public bool KeepAlive { - get - { + get + { if (HttpServer) - return _httpResponse.Connection == ConnectionType.KeepAlive; + return _httpResponse.Connection == ConnectionType.KeepAlive; else return _httpListenerResponse.KeepAlive; } @@ -178,7 +178,7 @@ namespace OpenSim.Framework.Servers { if (HttpServer) _httpResponse.Connection = ConnectionType.KeepAlive; - else + else _httpListenerResponse.KeepAlive = value; } } @@ -191,8 +191,8 @@ namespace OpenSim.Framework.Servers /// public Stream OutputStream { - get - { + get + { if (HttpServer) return _httpResponse.Body; else @@ -205,10 +205,10 @@ namespace OpenSim.Framework.Servers /// public Stream Body { - get - { + get + { if (HttpServer) - return _httpResponse.Body; + return _httpResponse.Body; throw new Exception("[OSHttpResponse] mixed .NET and HttpServer access"); } } @@ -228,18 +228,18 @@ namespace OpenSim.Framework.Servers } } - + /// /// Chunk transfers. /// public bool SendChunked { - get - { + get + { if (HttpServer) return _httpResponse.Chunked; else - return _httpListenerResponse.SendChunked; + return _httpListenerResponse.SendChunked; } set @@ -256,12 +256,12 @@ namespace OpenSim.Framework.Servers /// public int StatusCode { - get - { + get + { if (HttpServer) return (int)_httpResponse.Status; - else - return _httpListenerResponse.StatusCode; + else + return _httpListenerResponse.StatusCode; } set @@ -279,12 +279,12 @@ namespace OpenSim.Framework.Servers /// public string StatusDescription { - get - { + get + { if (HttpServer) return _httpResponse.Reason; else - return _httpListenerResponse.StatusDescription; + return _httpListenerResponse.StatusDescription; } set @@ -331,7 +331,7 @@ namespace OpenSim.Framework.Servers /// object. /// Incoming OSHttpRequest to which we are - /// replying + /// replying public OSHttpResponse(OSHttpRequest req) { _httpResponse = new HttpResponse(req.HttpClientContext, req.HttpRequest); @@ -343,7 +343,7 @@ namespace OpenSim.Framework.Servers /// string containing the header field /// name /// string containing the header field - /// value + /// value public void AddHeader(string key, string value) { if (HttpServer) @@ -361,8 +361,8 @@ namespace OpenSim.Framework.Servers { _httpResponse.Body.Flush(); _httpResponse.Send(); - } - else + } + else { OutputStream.Close(); } diff --git a/OpenSim/Framework/Servers/OSHttpServer.cs b/OpenSim/Framework/Servers/OSHttpServer.cs index e0d26ff..40f4229 100644 --- a/OpenSim/Framework/Servers/OSHttpServer.cs +++ b/OpenSim/Framework/Servers/OSHttpServer.cs @@ -80,7 +80,7 @@ namespace OpenSim.Framework.Servers get { return _isSecure; } } - public int QueueSize + public int QueueSize { get { return _pumps.Length; } } @@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers protected List _httpHandlers = new List(); public List OSHttpHandlers { - get + get { lock (_httpHandlers) { @@ -175,7 +175,7 @@ namespace OpenSim.Framework.Servers _listener.RequestHandler += OnHttpRequest; _listener.Start(QueueSize); _log.InfoFormat("[{0}] HTTP server started", EngineID); - + lock (_syncObject) Monitor.Wait(_syncObject); } catch (Exception ex) @@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers /// and regular expressions to match against header values public void AddHandler(OSHttpHandler handler) { - lock (_httpHandlers) + lock (_httpHandlers) { if (_httpHandlers.Contains(handler)) { diff --git a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs index f3f056a..996e5dc 100644 --- a/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs +++ b/OpenSim/Framework/Servers/OSHttpXmlRpcHandler.cs @@ -54,16 +54,16 @@ namespace OpenSim.Framework.Servers protected bool XmlRpcMethodMatch(OSHttpRequest req) { XmlRpcRequest xmlRpcRequest = null; - + // check whether req is already reified // if not: reify (and post to whiteboard) - try + try { if (req.Whiteboard.ContainsKey("xmlrequest")) { xmlRpcRequest = req.Whiteboard["xmlrequest"] as XmlRpcRequest; } - else + else { StreamReader body = new StreamReader(req.InputStream); string requestBody = body.ReadToEnd(); @@ -76,22 +76,22 @@ namespace OpenSim.Framework.Servers _log.ErrorFormat("[OSHttpXmlRpcHandler] failed to deserialize XmlRpcRequest from {0}", req.ToString()); return false; } - + // check against methodName - if ((null != xmlRpcRequest) - && !String.IsNullOrEmpty(xmlRpcRequest.MethodName) + if ((null != xmlRpcRequest) + && !String.IsNullOrEmpty(xmlRpcRequest.MethodName) && xmlRpcRequest.MethodName == _methodName) { _log.DebugFormat("[OSHttpXmlRpcHandler] located handler {0} for {1}", _methodName, req.ToString()); return true; } - + return false; } // contains handler for processing XmlRpc Request private XmlRpcMethod _handler; - + // contains XmlRpc method name private string _methodName; @@ -112,9 +112,9 @@ namespace OpenSim.Framework.Servers /// can be null, in which case they are not taken into account /// when the handler is being looked up. /// - public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path, + public OSHttpXmlRpcHandler(XmlRpcMethod handler, string methodName, Regex path, Dictionary headers, Regex whitelist) - : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, null, headers, + : base(new Regex(@"^POST$", RegexOptions.IgnoreCase | RegexOptions.Compiled), path, null, headers, new Regex(@"^(text|application)/xml", RegexOptions.IgnoreCase | RegexOptions.Compiled), whitelist) { @@ -138,7 +138,7 @@ namespace OpenSim.Framework.Servers /// /// Invoked by OSHttpRequestPump. /// - public override OSHttpHandlerResult Process(OSHttpRequest request) + public override OSHttpHandlerResult Process(OSHttpRequest request) { XmlRpcResponse xmlRpcResponse; string responseString; @@ -148,13 +148,13 @@ namespace OpenSim.Framework.Servers OSHttpResponse resp = new OSHttpResponse(request); - try + try { // reified XmlRpcRequest must still be on the whiteboard XmlRpcRequest xmlRpcRequest = request.Whiteboard["xmlrequest"] as XmlRpcRequest; xmlRpcResponse = _handler(xmlRpcRequest); responseString = XmlRpcResponseSerializer.Singleton.Serialize(xmlRpcResponse); - + resp.ContentType = "text/xml"; byte[] buffer = Encoding.UTF8.GetBytes(responseString); @@ -176,4 +176,4 @@ namespace OpenSim.Framework.Servers return OSHttpHandlerResult.Done; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs index 1ed349f..1cfb425 100644 --- a/OpenSim/Framework/Servers/RestSessionService.cs +++ b/OpenSim/Framework/Servers/RestSessionService.cs @@ -151,7 +151,7 @@ namespace OpenSim.Framework.Servers private CheckIdentityMethod m_smethod; public RestDeserialiseSecureHandler( - string httpMethod, string path, + string httpMethod, string path, RestDeserialiseMethod method, CheckIdentityMethod smethod) : base(httpMethod, path) { @@ -196,7 +196,7 @@ namespace OpenSim.Framework.Servers /// /// private RestDeserialiseMethod m_method; - + /// /// The method used to check whether a request is trusted. /// diff --git a/OpenSim/Framework/Statistics/BaseStatsCollector.cs b/OpenSim/Framework/Statistics/BaseStatsCollector.cs index c888f4c..1e59983 100644 --- a/OpenSim/Framework/Statistics/BaseStatsCollector.cs +++ b/OpenSim/Framework/Statistics/BaseStatsCollector.cs @@ -24,10 +24,10 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + using System; using System.Text; - + namespace OpenSim.Framework.Statistics { /// @@ -44,7 +44,7 @@ namespace OpenSim.Framework.Statistics string.Format( "Allocated to OpenSim : {0} MB" + Environment.NewLine, Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0))); - + return sb.ToString(); } } diff --git a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs index 06b3185..58d5621 100644 --- a/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs +++ b/OpenSim/Framework/Statistics/SimExtraStatsCollector.cs @@ -40,7 +40,7 @@ namespace OpenSim.Framework.Statistics public class SimExtraStatsCollector : BaseStatsCollector { private long abnormalClientThreadTerminations; - + private long assetsInCache; private long texturesInCache; private long assetCacheMemoryUsage; @@ -49,7 +49,7 @@ namespace OpenSim.Framework.Statistics private long assetServiceRequestFailures; private long inventoryServiceRetrievalFailures; - + private float timeDilation; private float simFps; private float physicsFps; @@ -70,8 +70,8 @@ namespace OpenSim.Framework.Statistics private float pendingDownloads; private float pendingUploads; private float activeScripts; - private float scriptLinesPerSecond; - + private float scriptLinesPerSecond; + /// /// Number of times that a client thread terminated because of an exception /// @@ -79,7 +79,7 @@ namespace OpenSim.Framework.Statistics /// /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the - /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these + /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these /// haven't yet been implemented... :) /// public long AssetsInCache { get { return assetsInCache; } } @@ -101,19 +101,19 @@ namespace OpenSim.Framework.Statistics /// as a failure /// public long AssetServiceRequestFailures { get { return assetServiceRequestFailures; } } - + /// /// Number of known failures to retrieve avatar inventory from the inventory service. This does not /// cover situations where the inventory service accepts the request but never returns any data, since /// we do not yet timeout this situation. /// public long InventoryServiceRetrievalFailures { get { return inventoryServiceRetrievalFailures; } } - + /// /// Retrieve the total frame time (in ms) of the last frame /// //public float TotalFrameTime { get { return totalFrameTime; } } - + /// /// Retrieve the physics update component (in ms) of the last frame /// @@ -124,7 +124,7 @@ namespace OpenSim.Framework.Statistics /// private IDictionary packetQueueStatsCollectors = new Dictionary(); - + public void AddAbnormalClientThreadTermination() { abnormalClientThreadTerminations++; @@ -146,7 +146,7 @@ namespace OpenSim.Framework.Statistics textureCacheMemoryUsage += image.Data.Length; } } - + /// /// Signal that the asset cache can be cleared. /// @@ -167,7 +167,7 @@ namespace OpenSim.Framework.Statistics { assetServiceRequestFailures++; } - + public void AddInventoryServiceRetrievalFailure() { inventoryServiceRetrievalFailures++; @@ -199,18 +199,18 @@ namespace OpenSim.Framework.Statistics packetQueueStatsCollectors.Remove(uuid); } } - + /// - /// This is the method on which the classic sim stats reporter (which collects stats for + /// This is the method on which the classic sim stats reporter (which collects stats for /// client purposes) sends information to listeners. /// /// - public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) + public void ReceiveClassicSimStatsPacket(SimStatsPacket statsPacket) { // FIXME: Really shouldn't rely on the probably arbitrary order in which // stats are packed into the packet timeDilation = statsPacket.Stat[0].StatValue; - simFps = statsPacket.Stat[1].StatValue; + simFps = statsPacket.Stat[1].StatValue; physicsFps = statsPacket.Stat[2].StatValue; agentUpdates = statsPacket.Stat[3].StatValue; rootAgents = statsPacket.Stat[4].StatValue; @@ -231,7 +231,7 @@ namespace OpenSim.Framework.Statistics activeScripts = statsPacket.Stat[19].StatValue; scriptLinesPerSecond = statsPacket.Stat[20].StatValue; } - + /// /// Report back collected statistical information. /// @@ -248,10 +248,10 @@ Texture cache contains {2,6} texture assets using {3,10} K Blocked client requests for missing textures: {4} Asset service request failures: {5}"+ Environment.NewLine, AssetsInCache, Math.Round(AssetCacheMemoryUsage / 1024.0), - TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0), + TexturesInCache, Math.Round(TextureCacheMemoryUsage / 1024.0), BlockedMissingTextureRequests, AssetServiceRequestFailures)); - + sb.Append(Environment.NewLine); sb.Append("CONNECTION STATISTICS"); sb.Append(Environment.NewLine); @@ -267,7 +267,7 @@ Asset service request failures: {5}"+ Environment.NewLine, string.Format( "Initial inventory caching failures: {0}" + Environment.NewLine, InventoryServiceRetrievalFailures)); - + sb.Append(Environment.NewLine); sb.Append("FRAME STATISTICS"); sb.Append(Environment.NewLine); @@ -278,18 +278,18 @@ Asset service request failures: {5}"+ Environment.NewLine, "{0,6:0.00} {1,6:0} {2,6:0.0} {3,6:0.0} {4,6:0} {5,6:0} {6,6:0} {7,6:0} {8,6:0} {9,6:0}", timeDilation, simFps, physicsFps, agentUpdates, rootAgents, childAgents, totalPrims, activePrims, activeScripts, scriptLinesPerSecond)); - + sb.Append(Environment.NewLine); sb.Append(Environment.NewLine); // There is no script frame time currently because we don't yet collect it sb.Append("PktsIn PktOut PendDl PendUl UnackB TotlFt NetFt PhysFt OthrFt AgntFt ImgsFt"); - sb.Append(Environment.NewLine); + sb.Append(Environment.NewLine); sb.Append( string.Format( "{0,6:0} {1,6:0} {2,6:0} {3,6:0} {4,6:0} {5,6:0.0} {6,6:0.0} {7,6:0.0} {8,6:0.0} {9,6:0.0} {10,6:0.0}", inPacketsPerSecond, outPacketsPerSecond, pendingDownloads, pendingUploads, unackedBytes, totalFrameTime, netFrameTime, physicsFrameTime, otherFrameTime, agentFrameTime, imageFrameTime)); - sb.Append(Environment.NewLine); + sb.Append(Environment.NewLine); /* sb.Append(Environment.NewLine); @@ -311,7 +311,7 @@ Asset service request failures: {5}"+ Environment.NewLine, */ sb.Append(base.Report()); - + return sb.ToString(); } } diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index 9b497ab..fc84041 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs @@ -226,7 +226,7 @@ namespace OpenSim.Framework private LLUUID _permsGranter; private int _permsMask; private int _type = 0; - + public LLUUID AssetID { get { return _assetID; @@ -437,4 +437,4 @@ namespace OpenSim.Framework _parentPartID = partID; } } -} \ No newline at end of file +} diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index bc35fa6..2a21221 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -716,7 +716,7 @@ namespace OpenSim.Framework XmlRpcRequest client = new XmlRpcRequest(methodName, args); return client.Send(url, 6000); } - + // used for RemoteParcelRequest (for "About Landmark") public static LLUUID BuildFakeParcelID(ulong regionHandle, uint x, uint y) { byte[] bytes = { @@ -726,7 +726,7 @@ namespace OpenSim.Framework (byte)(y >> 24), (byte)(y >> 16), (byte)(y >> 8), (byte)y }; return new LLUUID(bytes, 0); } - + public static void ParseFakeParcelID(LLUUID parcelID, out ulong regionHandle, out uint x, out uint y) { byte[] bytes = parcelID.GetBytes(); regionHandle = Helpers.BytesToUInt64(bytes); -- cgit v1.1