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
 
         #region IApplicationPlugin Members
 
-        public void Initialise(OpenSimMain openSim)
+        public void Initialise(OpenSimBase openSim)
         {
             m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
 
@@ -84,7 +84,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
 
         #endregion
 
-        public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle)
+        public void LoadRegionFromConfig(OpenSimBase openSim, ulong regionhandle)
         {
             m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
 
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
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private OpenSimMain m_app;
+        private OpenSimBase m_app;
         private BaseHttpServer m_httpd;
         private string requiredPassword = String.Empty;
 
-        public void Initialise(OpenSimMain openSim)
+        public void Initialise(OpenSimBase openSim)
         {
             try
             {
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
         /// Note that entries MUST be added to the active configuration files before
         /// the plugin can be enabled.
         /// </remarks>
-        public override void Initialise(OpenSimMain openSim)
+        public override void Initialise(OpenSimBase openSim)
         {
             try
             {
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
 
         private IConfig        _config;       // Configuration source: Rest Plugins
         private IConfig        _pluginConfig; // Configuration source: Plugin specific
-        private OpenSimMain    _app;          // The 'server'
+        private OpenSimBase    _app;          // The 'server'
         private BaseHttpServer _httpd;        // The server's RPC interface
         private string         _prefix;       // URL prefix below
                                               // which all REST URLs
@@ -114,7 +114,7 @@ namespace OpenSim.ApplicationPlugins.Rest
         /// <summary>
         /// OpenSimMain application
         /// </summary>
-        public OpenSimMain App
+        public OpenSimBase App
         {
             get { return _app; }
         }
@@ -196,7 +196,7 @@ namespace OpenSim.ApplicationPlugins.Rest
         /// Note that entries MUST be added to the active configuration files before
         /// the plugin can be enabled.
         /// </remarks>
-        public virtual void Initialise(OpenSimMain openSim)
+        public virtual void Initialise(OpenSimBase openSim)
         {
             RequestID = "0";
             MsgID = RequestID;