From 5648eb7bd1f2345aad1530d90964278fe352faea Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Aug 2015 15:52:26 -0700
Subject: Moved instantiation of SceneCommunicationService object to inside the
scene constructor. This was a left over from the original monolithic design
of scene communications. The less the instantiators of scenes know about the
scene's internals, the better.
---
OpenSim/Region/Application/OpenSimBase.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 3be411a..62a52d6 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -752,10 +752,8 @@ namespace OpenSim
Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
- SceneCommunicationService sceneGridService = new SceneCommunicationService();
-
return new Scene(
- regionInfo, circuitManager, physicsScene, sceneGridService,
+ regionInfo, circuitManager, physicsScene,
simDataService, estateDataService,
Config, m_version);
}
--
cgit v1.1
From 2c0cad6dd3014e9ad363090f5f7872c43daffcbd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Aug 2015 20:29:31 -0700
Subject: Renamed the namespaces too
---
OpenSim/Region/Application/OpenSimBase.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 62a52d6..f263556 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.PhysicsModule.SharedBase;
using OpenSim.Server.Base;
using OpenSim.Services.Base;
using OpenSim.Services.Interfaces;
--
cgit v1.1
From ce2c67876e0ebf4f84420696f660dc77d96dea6b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Aug 2015 21:05:36 -0700
Subject: More namespace and dll name changes. Still no functional changes.
---
OpenSim/Region/Application/OpenSimBase.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f263556..68fba97 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -46,7 +46,7 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.PhysicsModule.SharedBase;
+using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Server.Base;
using OpenSim.Services.Base;
using OpenSim.Services.Interfaces;
--
cgit v1.1
From 11194209df8a29f5103e6e34104eae7834f3280a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 31 Aug 2015 14:09:15 -0700
Subject: First commit where physics work as region module. Moved all physics
dlls out of Physics and into bin directly, so they can be found by the module
loader. Removed call to PhysicsPluginManager.
---
OpenSim/Region/Application/OpenSimBase.cs | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 68fba97..980fa85 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -734,10 +734,6 @@ namespace OpenSim
clientServer = clientNetworkServers;
scene.LoadWorldMap();
- scene.PhysicsScene.RequestAssetMethod = scene.PhysicsRequestAsset;
- scene.PhysicsScene.SetTerrain(scene.Heightmap.GetFloatsSerialised());
- scene.PhysicsScene.SetWaterLevel((float) regionInfo.RegionSettings.WaterHeight);
-
return scene;
}
@@ -749,11 +745,8 @@ namespace OpenSim
protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
IEstateDataService estateDataService, AgentCircuitManager circuitManager)
{
- Vector3 regionExtent = new Vector3(regionInfo.RegionSizeX, regionInfo.RegionSizeY, regionInfo.RegionSizeZ);
- PhysicsScene physicsScene = GetPhysicsScene(regionInfo.RegionName, regionExtent);
-
return new Scene(
- regionInfo, circuitManager, physicsScene,
+ regionInfo, circuitManager,
simDataService, estateDataService,
Config, m_version);
}
@@ -796,12 +789,6 @@ namespace OpenSim
# region Setup methods
- protected override PhysicsScene GetPhysicsScene(string osSceneIdentifier, Vector3 regionExtent)
- {
- return GetPhysicsScene(
- m_configSettings.PhysicsEngine, m_configSettings.MeshEngineName, Config, osSceneIdentifier, regionExtent);
- }
-
///
/// Handler to supply the current status of this sim
///
--
cgit v1.1
From dac8edd5dddb5f3d2a2447fb479144429e32ea68 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 3 Sep 2015 15:59:06 -0700
Subject: Transformed the LLUDP ad-hoc plugin into a region module. It works.
---
OpenSim/Region/Application/OpenSimBackground.cs | 2 +-
OpenSim/Region/Application/OpenSimBase.cs | 151 ++++++++++-----------
.../Region/Application/RegionApplicationBase.cs | 104 ++++++++++++++
3 files changed, 173 insertions(+), 84 deletions(-)
create mode 100644 OpenSim/Region/Application/RegionApplicationBase.cs
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs
index 008c6b0..15d9065 100644
--- a/OpenSim/Region/Application/OpenSimBackground.cs
+++ b/OpenSim/Region/Application/OpenSimBackground.cs
@@ -55,7 +55,7 @@ namespace OpenSim
base.Startup();
m_log.InfoFormat("[OPENSIM MAIN]: Startup complete, serving {0} region{1}",
- m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : "");
+ SceneManager.Scenes.Count, SceneManager.Scenes.Count > 1 ? "s" : "");
WorldHasComeToAnEnd.WaitOne();
WorldHasComeToAnEnd.Close();
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 980fa85..6e984d8 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -41,7 +41,6 @@ using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Framework.Monitoring;
-using OpenSim.Region.ClientStack;
using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -117,19 +116,12 @@ namespace OpenSim
///
public OpenSimConfigSource ConfigSource { get; private set; }
- public List ClientServers
- {
- get { return m_clientServers; }
- }
-
protected EnvConfigSource m_EnvConfigSource = new EnvConfigSource();
public EnvConfigSource envConfigSource
{
get { return m_EnvConfigSource; }
}
-
- protected List m_clientServers = new List();
public uint HttpServerPort
{
@@ -359,9 +351,9 @@ namespace OpenSim
///
///
///
- public List CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
+ public void CreateRegion(RegionInfo regionInfo, bool portadd_flag, out IScene scene)
{
- return CreateRegion(regionInfo, portadd_flag, false, out scene);
+ CreateRegion(regionInfo, portadd_flag, false, out scene);
}
///
@@ -369,9 +361,9 @@ namespace OpenSim
///
///
///
- public List CreateRegion(RegionInfo regionInfo, out IScene scene)
+ public void CreateRegion(RegionInfo regionInfo, out IScene scene)
{
- return CreateRegion(regionInfo, false, true, out scene);
+ CreateRegion(regionInfo, false, true, out scene);
}
///
@@ -381,7 +373,7 @@ namespace OpenSim
///
///
///
- public List CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
+ public void CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init, out IScene mscene)
{
int port = regionInfo.InternalEndPoint.Port;
@@ -406,8 +398,7 @@ namespace OpenSim
Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName);
}
- List clientServers;
- Scene scene = SetupScene(regionInfo, proxyOffset, Config, out clientServers);
+ Scene scene = SetupScene(regionInfo, proxyOffset, Config);
m_log.Info("[MODULES]: Loading Region's modules (old style)");
@@ -455,20 +446,20 @@ namespace OpenSim
SceneManager.Add(scene);
- if (m_autoCreateClientStack)
- {
- foreach (IClientNetworkServer clientserver in clientServers)
- {
- m_clientServers.Add(clientserver);
- clientserver.Start();
- }
- }
+ //if (m_autoCreateClientStack)
+ //{
+ // foreach (IClientNetworkServer clientserver in clientServers)
+ // {
+ // m_clientServers.Add(clientserver);
+ // clientserver.Start();
+ // }
+ //}
scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
mscene = scene;
- return clientServers;
+ //return clientServers;
}
///
@@ -602,7 +593,7 @@ namespace OpenSim
scene.DeleteAllSceneObjects();
SceneManager.CloseScene(scene);
- ShutdownClientServer(scene.RegionInfo);
+ //ShutdownClientServer(scene.RegionInfo);
if (!cleanup)
return;
@@ -663,7 +654,7 @@ namespace OpenSim
}
SceneManager.CloseScene(scene);
- ShutdownClientServer(scene.RegionInfo);
+ //ShutdownClientServer(scene.RegionInfo);
}
///
@@ -684,9 +675,9 @@ namespace OpenSim
///
///
///
- protected Scene SetupScene(RegionInfo regionInfo, out List clientServer)
+ protected Scene SetupScene(RegionInfo regionInfo)
{
- return SetupScene(regionInfo, 0, null, out clientServer);
+ return SetupScene(regionInfo, 0, null);
}
///
@@ -697,51 +688,45 @@ namespace OpenSim
///
///
///
- protected Scene SetupScene(
- RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out List clientServer)
+ protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, IConfigSource configSource)
{
- List clientNetworkServers = null;
+ //List clientNetworkServers = null;
AgentCircuitManager circuitManager = new AgentCircuitManager();
- IPAddress listenIP = regionInfo.InternalEndPoint.Address;
- //if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
- // listenIP = IPAddress.Parse("0.0.0.0");
+ //IPAddress listenIP = regionInfo.InternalEndPoint.Address;
+ ////if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
+ //// listenIP = IPAddress.Parse("0.0.0.0");
- uint port = (uint) regionInfo.InternalEndPoint.Port;
+ //uint port = (uint) regionInfo.InternalEndPoint.Port;
- if (m_autoCreateClientStack)
- {
- clientNetworkServers = m_clientStackManager.CreateServers(
- listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
- circuitManager);
- }
- else
- {
- clientServer = null;
- }
+ //if (m_autoCreateClientStack)
+ //{
+ // clientNetworkServers = m_clientStackManager.CreateServers(
+ // listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
+ // circuitManager);
+ //}
+ //else
+ //{
+ // clientServer = null;
+ //}
- regionInfo.InternalEndPoint.Port = (int) port;
+ //regionInfo.InternalEndPoint.Port = (int) port;
Scene scene = CreateScene(regionInfo, m_simulationDataService, m_estateDataService, circuitManager);
- if (m_autoCreateClientStack)
- {
- foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
- {
- clientnetserver.AddScene(scene);
- }
- }
- clientServer = clientNetworkServers;
+ //if (m_autoCreateClientStack)
+ //{
+ // foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
+ // {
+ // clientnetserver.AddScene(scene);
+ // }
+ //}
+ //clientServer = clientNetworkServers;
scene.LoadWorldMap();
return scene;
}
- protected override ClientStackManager CreateClientStackManager()
- {
- return new ClientStackManager(m_configSettings.ClientstackDll);
- }
-
protected override Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService,
IEstateDataService estateDataService, AgentCircuitManager circuitManager)
{
@@ -751,29 +736,29 @@ namespace OpenSim
Config, m_version);
}
- protected void ShutdownClientServer(RegionInfo whichRegion)
- {
- // Close and remove the clientserver for a region
- bool foundClientServer = false;
- int clientServerElement = 0;
- Location location = new Location(whichRegion.RegionHandle);
-
- for (int i = 0; i < m_clientServers.Count; i++)
- {
- if (m_clientServers[i].HandlesRegion(location))
- {
- clientServerElement = i;
- foundClientServer = true;
- break;
- }
- }
-
- if (foundClientServer)
- {
- m_clientServers[clientServerElement].Stop();
- m_clientServers.RemoveAt(clientServerElement);
- }
- }
+ //protected void ShutdownClientServer(RegionInfo whichRegion)
+ //{
+ // // Close and remove the clientserver for a region
+ // bool foundClientServer = false;
+ // int clientServerElement = 0;
+ // Location location = new Location(whichRegion.RegionHandle);
+
+ // for (int i = 0; i < m_clientServers.Count; i++)
+ // {
+ // if (m_clientServers[i].HandlesRegion(location))
+ // {
+ // clientServerElement = i;
+ // foundClientServer = true;
+ // break;
+ // }
+ // }
+
+ // if (foundClientServer)
+ // {
+ // m_clientServers[clientServerElement].Stop();
+ // m_clientServers.RemoveAt(clientServerElement);
+ // }
+ //}
protected virtual void HandleRestartRegion(RegionInfo whichRegion)
{
@@ -781,7 +766,7 @@ namespace OpenSim
"[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})",
whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY);
- ShutdownClientServer(whichRegion);
+ //ShutdownClientServer(whichRegion);
IScene scene;
CreateRegion(whichRegion, true, out scene);
scene.Start();
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
new file mode 100644
index 0000000..b58c998
--- /dev/null
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using System.Net;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.PhysicsModules.SharedBase;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim
+{
+ public abstract class RegionApplicationBase : BaseOpenSimServer
+ {
+ private static readonly ILog m_log
+ = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ protected Dictionary m_clientCircuits = new Dictionary();
+ protected NetworkServersInfo m_networkServersInfo;
+ protected uint m_httpServerPort;
+ protected ISimulationDataService m_simulationDataService;
+ protected IEstateDataService m_estateDataService;
+
+ public SceneManager SceneManager { get; protected set; }
+ public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
+ public ISimulationDataService SimulationDataService { get { return m_simulationDataService; } }
+ public IEstateDataService EstateDataService { get { return m_estateDataService; } }
+
+ protected abstract void Initialize();
+
+ protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager);
+
+ protected override void StartupSpecific()
+ {
+ SceneManager = SceneManager.Instance;
+
+ Initialize();
+
+ m_httpServer
+ = new BaseHttpServer(
+ m_httpServerPort, m_networkServersInfo.HttpUsesSSL, m_networkServersInfo.httpSSLPort,
+ m_networkServersInfo.HttpSSLCN);
+
+ if (m_networkServersInfo.HttpUsesSSL && (m_networkServersInfo.HttpListenerPort == m_networkServersInfo.httpSSLPort))
+ {
+ m_log.Error("[REGION SERVER]: HTTP Server config failed. HTTP Server and HTTPS server must be on different ports");
+ }
+
+ m_log.InfoFormat("[REGION SERVER]: Starting HTTP server on port {0}", m_httpServerPort);
+ m_httpServer.Start();
+
+ MainServer.AddHttpServer(m_httpServer);
+ MainServer.Instance = m_httpServer;
+
+ // "OOB" Server
+ if (m_networkServersInfo.ssl_listener)
+ {
+ BaseHttpServer server = new BaseHttpServer(
+ m_networkServersInfo.https_port, m_networkServersInfo.ssl_listener, m_networkServersInfo.cert_path,
+ m_networkServersInfo.cert_pass);
+
+ m_log.InfoFormat("[REGION SERVER]: Starting HTTPS server on port {0}", server.Port);
+ MainServer.AddHttpServer(server);
+ server.Start();
+ }
+
+ base.StartupSpecific();
+ }
+
+ }
+}
\ No newline at end of file
--
cgit v1.1
From 9d7e310e21b6405f1ecde074e9b7d4ea29c76ad7 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Sep 2015 09:40:21 -0700
Subject: Deleted commented code
---
OpenSim/Region/Application/OpenSimBase.cs | 51 -------------------------------
1 file changed, 51 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6e984d8..83c07f1 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -693,35 +693,8 @@ namespace OpenSim
//List clientNetworkServers = null;
AgentCircuitManager circuitManager = new AgentCircuitManager();
- //IPAddress listenIP = regionInfo.InternalEndPoint.Address;
- ////if (!IPAddress.TryParse(regionInfo.InternalEndPoint, out listenIP))
- //// listenIP = IPAddress.Parse("0.0.0.0");
-
- //uint port = (uint) regionInfo.InternalEndPoint.Port;
-
- //if (m_autoCreateClientStack)
- //{
- // clientNetworkServers = m_clientStackManager.CreateServers(
- // listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
- // circuitManager);
- //}
- //else
- //{
- // clientServer = null;
- //}
-
- //regionInfo.InternalEndPoint.Port = (int) port;
-
Scene scene = CreateScene(regionInfo, m_simulationDataService, m_estateDataService, circuitManager);
- //if (m_autoCreateClientStack)
- //{
- // foreach (IClientNetworkServer clientnetserver in clientNetworkServers)
- // {
- // clientnetserver.AddScene(scene);
- // }
- //}
- //clientServer = clientNetworkServers;
scene.LoadWorldMap();
return scene;
@@ -736,30 +709,6 @@ namespace OpenSim
Config, m_version);
}
- //protected void ShutdownClientServer(RegionInfo whichRegion)
- //{
- // // Close and remove the clientserver for a region
- // bool foundClientServer = false;
- // int clientServerElement = 0;
- // Location location = new Location(whichRegion.RegionHandle);
-
- // for (int i = 0; i < m_clientServers.Count; i++)
- // {
- // if (m_clientServers[i].HandlesRegion(location))
- // {
- // clientServerElement = i;
- // foundClientServer = true;
- // break;
- // }
- // }
-
- // if (foundClientServer)
- // {
- // m_clientServers[clientServerElement].Stop();
- // m_clientServers.RemoveAt(clientServerElement);
- // }
- //}
-
protected virtual void HandleRestartRegion(RegionInfo whichRegion)
{
m_log.InfoFormat(
--
cgit v1.1
From d00f73c3a4cac77c97dcf4df1613fb85a516ffb4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Sep 2015 14:39:23 -0700
Subject: Deleted OpenSim.Framework.Communications. Moved its two remaining
files to OpenSim.Framework.
---
OpenSim/Region/Application/OpenSimBase.cs | 1 -
OpenSim/Region/Application/RegionApplicationBase.cs | 1 -
2 files changed, 2 deletions(-)
(limited to 'OpenSim/Region/Application')
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 83c07f1..ab6f036 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,7 +36,6 @@ using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
-using OpenSim.Framework.Communications;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
diff --git a/OpenSim/Region/Application/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index b58c998..08c8579 100644
--- a/OpenSim/Region/Application/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -32,7 +32,6 @@ using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
-using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework;
--
cgit v1.1