diff options
author | Johan Berntsson | 2008-06-20 01:35:54 +0000 |
---|---|---|
committer | Johan Berntsson | 2008-06-20 01:35:54 +0000 |
commit | 20e403685345e0e85d2eb54557b61dddc0af885e (patch) | |
tree | 91651802445b37bb6d64a6277a2b4231b14673a6 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | Mantis#1573. Thank you kindly, Mikem for a patch to our (diff) | |
download | opensim-SC-20e403685345e0e85d2eb54557b61dddc0af885e.zip opensim-SC-20e403685345e0e85d2eb54557b61dddc0af885e.tar.gz opensim-SC-20e403685345e0e85d2eb54557b61dddc0af885e.tar.bz2 opensim-SC-20e403685345e0e85d2eb54557b61dddc0af885e.tar.xz |
Implemented plugin support for ClientStack, with LindenUDP as the default plugin. This makes it easy for developers to experiment with alternative communication protocols
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index d96336a..621d0ef 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -35,7 +35,6 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Framework.Communications; | 35 | using OpenSim.Framework.Communications; |
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
38 | using OpenSim.Region.ClientStack.LindenUDP; | ||
39 | using OpenSim.Region.Environment; | 38 | using OpenSim.Region.Environment; |
40 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Environment.Scenes; |
41 | using OpenSim.Region.Physics.Manager; | 40 | using OpenSim.Region.Physics.Manager; |
@@ -64,6 +63,8 @@ namespace OpenSim.Region.ClientStack | |||
64 | protected StorageManager m_storageManager; | 63 | protected StorageManager m_storageManager; |
65 | protected string m_storageConnectionString; | 64 | protected string m_storageConnectionString; |
66 | 65 | ||
66 | protected ClientStackManager m_clientStackManager; | ||
67 | |||
67 | // An attribute to indicate whether prim inventories should be persisted. | 68 | // An attribute to indicate whether prim inventories should be persisted. |
68 | // Probably will be temporary until this stops being experimental. | 69 | // Probably will be temporary until this stops being experimental. |
69 | protected bool m_storagePersistPrimInventories; | 70 | protected bool m_storagePersistPrimInventories; |
@@ -77,10 +78,10 @@ namespace OpenSim.Region.ClientStack | |||
77 | { | 78 | { |
78 | base.Startup(); | 79 | base.Startup(); |
79 | 80 | ||
80 | LLClientView.TerrainManager = new TerrainManager(new SecondLife()); | ||
81 | |||
82 | m_storageManager = CreateStorageManager(m_storageConnectionString); | 81 | m_storageManager = CreateStorageManager(m_storageConnectionString); |
83 | 82 | ||
83 | m_clientStackManager = CreateClientStackManager(); | ||
84 | |||
84 | Initialize(); | 85 | Initialize(); |
85 | 86 | ||
86 | m_httpServer = new BaseHttpServer(m_httpServerPort); | 87 | m_httpServer = new BaseHttpServer(m_httpServerPort); |
@@ -101,6 +102,7 @@ namespace OpenSim.Region.ClientStack | |||
101 | // protected abstract ConsoleBase CreateConsole(); | 102 | // protected abstract ConsoleBase CreateConsole(); |
102 | protected abstract PhysicsScene GetPhysicsScene(); | 103 | protected abstract PhysicsScene GetPhysicsScene(); |
103 | protected abstract StorageManager CreateStorageManager(string connectionstring); | 104 | protected abstract StorageManager CreateStorageManager(string connectionstring); |
105 | protected abstract ClientStackManager CreateClientStackManager(); | ||
104 | 106 | ||
105 | protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config) | 107 | protected PhysicsScene GetPhysicsScene(string engine, string meshEngine, IConfigSource config) |
106 | { | 108 | { |
@@ -123,7 +125,7 @@ namespace OpenSim.Region.ClientStack | |||
123 | // listenIP = IPAddress.Parse("0.0.0.0"); | 125 | // listenIP = IPAddress.Parse("0.0.0.0"); |
124 | 126 | ||
125 | uint port = (uint) regionInfo.InternalEndPoint.Port; | 127 | uint port = (uint) regionInfo.InternalEndPoint.Port; |
126 | clientServer = new LLUDPServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager); | 128 | clientServer = m_clientStackManager.CreateServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager); |
127 | regionInfo.InternalEndPoint.Port = (int)port; | 129 | regionInfo.InternalEndPoint.Port = (int)port; |
128 | 130 | ||
129 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); | 131 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); |