diff options
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 | |||
232 | // Get plugin specific config | 232 | // Get plugin specific config |
233 | _pluginConfig = openSim.ConfigSource.Source.Configs[ConfigName]; | 233 | _pluginConfig = openSim.ConfigSource.Source.Configs[ConfigName]; |
234 | 234 | ||
235 | |||
236 | m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); | 235 | m_log.InfoFormat("{0} Rest Plugins Enabled", MsgID); |
237 | } | 236 | } |
238 | catch (Exception e) | 237 | 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 | |||
53 | 53 | ||
54 | protected BaseHttpServer m_httpServer; | 54 | protected BaseHttpServer m_httpServer; |
55 | protected uint m_httpServerPort; | 55 | protected uint m_httpServerPort; |
56 | 56 | ||
57 | protected CommunicationsManager m_commsManager; | 57 | public CommunicationsManager CommunicationsManager |
58 | public CommunicationsManager CommunicationsManager { | 58 | { |
59 | get { return m_commsManager; } | 59 | get { return m_commsManager; } |
60 | } | 60 | } |
61 | 61 | protected CommunicationsManager m_commsManager; | |
62 | protected SceneManager m_sceneManager = new SceneManager(); | ||
63 | 62 | ||
64 | protected StorageManager m_storageManager; | 63 | protected StorageManager m_storageManager; |
65 | 64 | ||
@@ -69,6 +68,7 @@ namespace OpenSim.Region.ClientStack | |||
69 | { | 68 | { |
70 | get { return m_sceneManager; } | 69 | get { return m_sceneManager; } |
71 | } | 70 | } |
71 | protected SceneManager m_sceneManager = new SceneManager(); | ||
72 | 72 | ||
73 | protected abstract void Initialize(); | 73 | protected abstract void Initialize(); |
74 | protected abstract PhysicsScene GetPhysicsScene(); | 74 | 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; | |||
33 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
34 | { | 34 | { |
35 | /// <summary> | 35 | /// <summary> |
36 | /// An interface for accessing and managing agent inventory | 36 | /// An interface for a module that manages inter-agent inventory offers and transfers. |
37 | /// </summary> | 37 | /// </summary> |
38 | public interface IInventoryTransferModule | 38 | public interface IInventoryTransferModule |
39 | { | 39 | { |
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 | |||
244 | if (item == null) | 244 | if (item == null) |
245 | reason += " Item not found."; | 245 | reason += " Item not found."; |
246 | client.SendAgentAlertMessage("Unable to delete "+ | 246 | client.SendAgentAlertMessage("Unable to delete "+ |
247 | "received item"+reason, false); | 247 | "received item" + reason, false); |
248 | } | 248 | } |
249 | } | 249 | } |
250 | 250 | ||
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 | |||
38 | { | 38 | { |
39 | public delegate void RestartSim(RegionInfo thisregion); | 39 | public delegate void RestartSim(RegionInfo thisregion); |
40 | 40 | ||
41 | /// <summary> | ||
42 | /// Manager for adding, closing and restarting scenes. | ||
43 | /// </summary> | ||
41 | public class SceneManager | 44 | public class SceneManager |
42 | { | 45 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | 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 | |||
84 | 84 | ||
85 | public void Initialise(OpenSimBase openSim) | 85 | public void Initialise(OpenSimBase openSim) |
86 | { | 86 | { |
87 | m_log.Info("[BALANCER] " + "Entering Initialize()"); | 87 | m_log.Info("[BALANCER]: " + "Entering Initialize()"); |
88 | 88 | ||
89 | proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); | 89 | proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); |
90 | if (proxyURL.Length == 0) return; | 90 | if (proxyURL.Length == 0) return; |