aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/RegionApplicationBase.cs (renamed from OpenSim/Region/ClientStack/RegionApplicationBase.cs)38
1 files changed, 3 insertions, 35 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs
index 853b72d..08c8579 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/Application/RegionApplicationBase.cs
@@ -32,15 +32,15 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
37using OpenSim.Framework.Servers.HttpServer; 36using OpenSim.Framework.Servers.HttpServer;
38using OpenSim.Region.Framework; 37using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.Physics.Manager; 40using OpenSim.Region.PhysicsModules.SharedBase;
41using OpenSim.Services.Interfaces;
42 42
43namespace OpenSim.Region.ClientStack 43namespace OpenSim
44{ 44{
45 public abstract class RegionApplicationBase : BaseOpenSimServer 45 public abstract class RegionApplicationBase : BaseOpenSimServer
46 { 46 {
@@ -52,7 +52,6 @@ namespace OpenSim.Region.ClientStack
52 protected uint m_httpServerPort; 52 protected uint m_httpServerPort;
53 protected ISimulationDataService m_simulationDataService; 53 protected ISimulationDataService m_simulationDataService;
54 protected IEstateDataService m_estateDataService; 54 protected IEstateDataService m_estateDataService;
55 protected ClientStackManager m_clientStackManager;
56 55
57 public SceneManager SceneManager { get; protected set; } 56 public SceneManager SceneManager { get; protected set; }
58 public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } } 57 public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } }
@@ -61,23 +60,11 @@ namespace OpenSim.Region.ClientStack
61 60
62 protected abstract void Initialize(); 61 protected abstract void Initialize();
63 62
64 /// <summary>
65 /// Get a new physics scene.
66 /// </summary>
67 ///
68 /// <param name="osSceneIdentifier">
69 /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
70 /// </param>
71 /// <returns></returns>
72 protected abstract PhysicsScene GetPhysicsScene(string osSceneIdentifier);
73
74 protected abstract ClientStackManager CreateClientStackManager();
75 protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); 63 protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager);
76 64
77 protected override void StartupSpecific() 65 protected override void StartupSpecific()
78 { 66 {
79 SceneManager = SceneManager.Instance; 67 SceneManager = SceneManager.Instance;
80 m_clientStackManager = CreateClientStackManager();
81 68
82 Initialize(); 69 Initialize();
83 70
@@ -112,24 +99,5 @@ namespace OpenSim.Region.ClientStack
112 base.StartupSpecific(); 99 base.StartupSpecific();
113 } 100 }
114 101
115 /// <summary>
116 /// Get a new physics scene.
117 /// </summary>
118 /// <param name="engine">The name of the physics engine to use</param>
119 /// <param name="meshEngine">The name of the mesh engine to use</param>
120 /// <param name="config">The configuration data to pass to the physics and mesh engines</param>
121 /// <param name="osSceneIdentifier">
122 /// The name of the OpenSim scene this physics scene is serving. This will be used in log messages.
123 /// </param>
124 /// <returns></returns>
125 protected PhysicsScene GetPhysicsScene(
126 string engine, string meshEngine, IConfigSource config, string osSceneIdentifier)
127 {
128 PhysicsPluginManager physicsPluginManager;
129 physicsPluginManager = new PhysicsPluginManager();
130 physicsPluginManager.LoadPluginsFromAssemblies("Physics");
131
132 return physicsPluginManager.GetPhysicsScene(engine, meshEngine, config, osSceneIdentifier);
133 }
134 } 102 }
135} \ No newline at end of file 103} \ No newline at end of file