From 18ba6c35105fcddbd5a8abedb8f70f67c3033aa1 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 1 Dec 2008 20:28:00 +0000 Subject: * minor: A few tiny bits of documentation and log message cleanup before starting something different --- OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 1 - OpenSim/Region/ClientStack/RegionApplicationBase.cs | 10 +++++----- .../Region/Environment/Interfaces/IInventoryTransferModule.cs | 2 +- .../Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneManager.cs | 3 +++ ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index 3fb9662..ba0d2d1 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs @@ -232,7 +232,6 @@ namespace OpenSim.ApplicationPlugins.Rest // Get plugin specific config _pluginConfig = openSim.ConfigSource.Source.Configs[ConfigName]; - m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); } catch (Exception e) diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 61edae5..ce978df 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -53,13 +53,12 @@ namespace OpenSim.Region.ClientStack protected BaseHttpServer m_httpServer; protected uint m_httpServerPort; - - protected CommunicationsManager m_commsManager; - public CommunicationsManager CommunicationsManager { + + public CommunicationsManager CommunicationsManager + { get { return m_commsManager; } } - - protected SceneManager m_sceneManager = new SceneManager(); + protected CommunicationsManager m_commsManager; protected StorageManager m_storageManager; @@ -69,6 +68,7 @@ namespace OpenSim.Region.ClientStack { get { return m_sceneManager; } } + protected SceneManager m_sceneManager = new SceneManager(); protected abstract void Initialize(); protected abstract PhysicsScene GetPhysicsScene(); diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs index 10fbd58..ee170b9 100644 --- a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs @@ -33,7 +33,7 @@ using OpenSim.Region.Environment.Scenes; namespace OpenSim.Framework { /// - /// An interface for accessing and managing agent inventory + /// An interface for a module that manages inter-agent inventory offers and transfers. /// public interface IInventoryTransferModule { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index cb65e9e..73f1761 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -244,7 +244,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer if (item == null) reason += " Item not found."; client.SendAgentAlertMessage("Unable to delete "+ - "received item"+reason, false); + "received item" + reason, false); } } diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 30dd497..bb74c20 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs @@ -38,6 +38,9 @@ namespace OpenSim.Region.Environment.Scenes { public delegate void RestartSim(RegionInfo thisregion); + /// + /// Manager for adding, closing and restarting scenes. + /// public class SceneManager { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 396ad59..b3b66da 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -84,7 +84,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer public void Initialise(OpenSimBase openSim) { - m_log.Info("[BALANCER] " + "Entering Initialize()"); + m_log.Info("[BALANCER]: " + "Entering Initialize()"); proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); if (proxyURL.Length == 0) return; -- cgit v1.1