diff options
author | Diva Canto | 2015-09-03 15:59:06 -0700 |
---|---|---|
committer | Diva Canto | 2015-09-03 15:59:06 -0700 |
commit | dac8edd5dddb5f3d2a2447fb479144429e32ea68 (patch) | |
tree | 5a68dcaa0f4cd75c97d16abb0a3c0bcb65b49d51 /OpenSim/Region/Application/RegionApplicationBase.cs | |
parent | Moved ExtendedPhysics from OptionalModules to Bullet project, because it's ve... (diff) | |
download | opensim-SC_OLD-dac8edd5dddb5f3d2a2447fb479144429e32ea68.zip opensim-SC_OLD-dac8edd5dddb5f3d2a2447fb479144429e32ea68.tar.gz opensim-SC_OLD-dac8edd5dddb5f3d2a2447fb479144429e32ea68.tar.bz2 opensim-SC_OLD-dac8edd5dddb5f3d2a2447fb479144429e32ea68.tar.xz |
Transformed the LLUDP ad-hoc plugin into a region module. It works.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/RegionApplicationBase.cs (renamed from OpenSim/Region/ClientStack/RegionApplicationBase.cs) | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/Application/RegionApplicationBase.cs index 343780b..b58c998 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/Application/RegionApplicationBase.cs | |||
@@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Scenes; | |||
41 | using OpenSim.Region.PhysicsModules.SharedBase; | 41 | using OpenSim.Region.PhysicsModules.SharedBase; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | 43 | ||
44 | namespace OpenSim.Region.ClientStack | 44 | namespace OpenSim |
45 | { | 45 | { |
46 | public abstract class RegionApplicationBase : BaseOpenSimServer | 46 | public abstract class RegionApplicationBase : BaseOpenSimServer |
47 | { | 47 | { |
@@ -53,7 +53,6 @@ namespace OpenSim.Region.ClientStack | |||
53 | protected uint m_httpServerPort; | 53 | protected uint m_httpServerPort; |
54 | protected ISimulationDataService m_simulationDataService; | 54 | protected ISimulationDataService m_simulationDataService; |
55 | protected IEstateDataService m_estateDataService; | 55 | protected IEstateDataService m_estateDataService; |
56 | protected ClientStackManager m_clientStackManager; | ||
57 | 56 | ||
58 | public SceneManager SceneManager { get; protected set; } | 57 | public SceneManager SceneManager { get; protected set; } |
59 | public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } } | 58 | public NetworkServersInfo NetServersInfo { get { return m_networkServersInfo; } } |
@@ -62,13 +61,11 @@ namespace OpenSim.Region.ClientStack | |||
62 | 61 | ||
63 | protected abstract void Initialize(); | 62 | protected abstract void Initialize(); |
64 | 63 | ||
65 | protected abstract ClientStackManager CreateClientStackManager(); | ||
66 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); | 64 | protected abstract Scene CreateScene(RegionInfo regionInfo, ISimulationDataService simDataService, IEstateDataService estateDataService, AgentCircuitManager circuitManager); |
67 | 65 | ||
68 | protected override void StartupSpecific() | 66 | protected override void StartupSpecific() |
69 | { | 67 | { |
70 | SceneManager = SceneManager.Instance; | 68 | SceneManager = SceneManager.Instance; |
71 | m_clientStackManager = CreateClientStackManager(); | ||
72 | 69 | ||
73 | Initialize(); | 70 | Initialize(); |
74 | 71 | ||