aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs10
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs7
2 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 62cd41d..48e988c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -25,9 +25,11 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Reflection;
29using System.Threading;
30using log4net;
28using Mono.Addins; 31using Mono.Addins;
29using OpenSim.Framework; 32using OpenSim.Framework;
30using OpenSim.Framework.Console;
31using OpenSim.Framework.RegionLoader.Filesystem; 33using OpenSim.Framework.RegionLoader.Filesystem;
32using OpenSim.Framework.RegionLoader.Web; 34using OpenSim.Framework.RegionLoader.Web;
33 35
@@ -39,7 +41,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
39 [Extension("/OpenSim/Startup")] 41 [Extension("/OpenSim/Startup")]
40 public class LoadRegionsPlugin : IApplicationPlugin 42 public class LoadRegionsPlugin : IApplicationPlugin
41 { 43 {
42 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 45
44 public void Initialise(OpenSimMain openSim) 46 public void Initialise(OpenSimMain openSim)
45 { 47 {
@@ -64,7 +66,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
64 66
65 for (int i = 0; i < regionsToLoad.Length; i++) 67 for (int i = 0; i < regionsToLoad.Length; i++)
66 { 68 {
67 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 69 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
68 openSim.CreateRegion(regionsToLoad[i], true); 70 openSim.CreateRegion(regionsToLoad[i], true);
69 } 71 }
70 72
@@ -94,7 +96,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
94 { 96 {
95 if (regionhandle == regionsToLoad[i].RegionHandle) 97 if (regionhandle == regionsToLoad[i].RegionHandle)
96 { 98 {
97 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 99 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + Thread.CurrentThread.ManagedThreadId.ToString() + ")");
98 openSim.CreateRegion(regionsToLoad[i], true); 100 openSim.CreateRegion(regionsToLoad[i], true);
99 } 101 }
100 } 102 }
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 6450ec7..3e0f4f6 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -27,14 +27,15 @@
27 27
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Net;
31using System.IO; 30using System.IO;
31using System.Net;
32using System.Reflection;
32using System.Timers; 33using System.Timers;
33using libsecondlife; 34using libsecondlife;
35using log4net;
34using Mono.Addins; 36using Mono.Addins;
35using Nwc.XmlRpc; 37using Nwc.XmlRpc;
36using OpenSim.Framework; 38using OpenSim.Framework;
37using OpenSim.Framework.Console;
38using OpenSim.Framework.Servers; 39using OpenSim.Framework.Servers;
39using OpenSim.Region.Environment.Scenes; 40using OpenSim.Region.Environment.Scenes;
40 41
@@ -46,7 +47,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
46 [Extension("/OpenSim/Startup")] 47 [Extension("/OpenSim/Startup")]
47 public class RemoteAdminPlugin : IApplicationPlugin 48 public class RemoteAdminPlugin : IApplicationPlugin
48 { 49 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50 51
51 private OpenSimMain m_app; 52 private OpenSimMain m_app;
52 private BaseHttpServer m_httpd; 53 private BaseHttpServer m_httpd;