aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-01 01:01:16 +0000
committerJustin Clarke Casey2008-06-01 01:01:16 +0000
commit8e1d3386561f263646c10c875aa00af4b3c9f815 (patch)
tree3fc89893ecdd75b0be7283dd0b4a2b9376b59964 /OpenSim/ApplicationPlugins
parent* Updates permission module so that GenericCommunicationPermission returns tr... (diff)
downloadopensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.zip
opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.gz
opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.bz2
opensim-SC_OLD-8e1d3386561f263646c10c875aa00af4b3c9f815.tar.xz
* Refactor: Split opensim background server into a separate class
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs6
4 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index dc4d1db..8dde28c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -46,7 +46,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
46 46
47 #region IApplicationPlugin Members 47 #region IApplicationPlugin Members
48 48
49 public void Initialise(OpenSimMain openSim) 49 public void Initialise(OpenSimBase openSim)
50 { 50 {
51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 51 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
52 52
@@ -84,7 +84,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
84 84
85 #endregion 85 #endregion
86 86
87 public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle) 87 public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle)
88 { 88 {
89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised"); 89 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
90 90
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c436596..232fd09 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -50,11 +50,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
50 { 50 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 private OpenSimMain m_app; 53 private OpenSimBase m_app;
54 private BaseHttpServer m_httpd; 54 private BaseHttpServer m_httpd;
55 private string requiredPassword = String.Empty; 55 private string requiredPassword = String.Empty;
56 56
57 public void Initialise(OpenSimMain openSim) 57 public void Initialise(OpenSimBase openSim)
58 { 58 {
59 try 59 try
60 { 60 {
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
index aeb91a9..9d68225 100644
--- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs
@@ -85,7 +85,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions
85 /// Note that entries MUST be added to the active configuration files before 85 /// Note that entries MUST be added to the active configuration files before
86 /// the plugin can be enabled. 86 /// the plugin can be enabled.
87 /// </remarks> 87 /// </remarks>
88 public override void Initialise(OpenSimMain openSim) 88 public override void Initialise(OpenSimBase openSim)
89 { 89 {
90 try 90 try
91 { 91 {
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index ffabb2a..e4bd544 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -60,7 +60,7 @@ namespace OpenSim.ApplicationPlugins.Rest
60 60
61 private IConfig _config; // Configuration source: Rest Plugins 61 private IConfig _config; // Configuration source: Rest Plugins
62 private IConfig _pluginConfig; // Configuration source: Plugin specific 62 private IConfig _pluginConfig; // Configuration source: Plugin specific
63 private OpenSimMain _app; // The 'server' 63 private OpenSimBase _app; // The 'server'
64 private BaseHttpServer _httpd; // The server's RPC interface 64 private BaseHttpServer _httpd; // The server's RPC interface
65 private string _prefix; // URL prefix below 65 private string _prefix; // URL prefix below
66 // which all REST URLs 66 // which all REST URLs
@@ -114,7 +114,7 @@ namespace OpenSim.ApplicationPlugins.Rest
114 /// <summary> 114 /// <summary>
115 /// OpenSimMain application 115 /// OpenSimMain application
116 /// </summary> 116 /// </summary>
117 public OpenSimMain App 117 public OpenSimBase App
118 { 118 {
119 get { return _app; } 119 get { return _app; }
120 } 120 }
@@ -196,7 +196,7 @@ namespace OpenSim.ApplicationPlugins.Rest
196 /// Note that entries MUST be added to the active configuration files before 196 /// Note that entries MUST be added to the active configuration files before
197 /// the plugin can be enabled. 197 /// the plugin can be enabled.
198 /// </remarks> 198 /// </remarks>
199 public virtual void Initialise(OpenSimMain openSim) 199 public virtual void Initialise(OpenSimBase openSim)
200 { 200 {
201 RequestID = "0"; 201 RequestID = "0";
202 MsgID = RequestID; 202 MsgID = RequestID;