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/Application/OpenSimBase.cs | |
parent | Mantis#1573. Thank you kindly, Mikem for a patch to our (diff) | |
download | opensim-SC_OLD-20e403685345e0e85d2eb54557b61dddc0af885e.zip opensim-SC_OLD-20e403685345e0e85d2eb54557b61dddc0af885e.tar.gz opensim-SC_OLD-20e403685345e0e85d2eb54557b61dddc0af885e.tar.bz2 opensim-SC_OLD-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/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 6d74903..572e98f 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -81,6 +81,7 @@ namespace OpenSim | |||
81 | protected LocalLoginService m_loginService; | 81 | protected LocalLoginService m_loginService; |
82 | 82 | ||
83 | protected string m_storageDll; | 83 | protected string m_storageDll; |
84 | protected string m_clientstackDll; | ||
84 | 85 | ||
85 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); | 86 | protected List<IClientNetworkServer> m_clientServers = new List<IClientNetworkServer>(); |
86 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); | 87 | protected List<RegionInfo> m_regionData = new List<RegionInfo>(); |
@@ -214,6 +215,7 @@ namespace OpenSim | |||
214 | config.Set("shutdown_console_commands_file", String.Empty); | 215 | config.Set("shutdown_console_commands_file", String.Empty); |
215 | config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); | 216 | config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); |
216 | config.Set("asset_database", "sqlite"); | 217 | config.Set("asset_database", "sqlite"); |
218 | config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); | ||
217 | } | 219 | } |
218 | 220 | ||
219 | if (DefaultConfig.Configs["StandAlone"] == null) | 221 | if (DefaultConfig.Configs["StandAlone"] == null) |
@@ -301,6 +303,7 @@ namespace OpenSim | |||
301 | 303 | ||
302 | m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); | 304 | m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"); |
303 | m_assetStorage = startupConfig.GetString("asset_database", "local"); | 305 | m_assetStorage = startupConfig.GetString("asset_database", "local"); |
306 | m_clientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); | ||
304 | } | 307 | } |
305 | 308 | ||
306 | IConfig standaloneConfig = m_config.Configs["StandAlone"]; | 309 | IConfig standaloneConfig = m_config.Configs["StandAlone"]; |
@@ -553,6 +556,11 @@ namespace OpenSim | |||
553 | return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories); | 556 | return new StorageManager(m_storageDll, connectionstring, m_storagePersistPrimInventories); |
554 | } | 557 | } |
555 | 558 | ||
559 | protected override ClientStackManager CreateClientStackManager() | ||
560 | { | ||
561 | return new ClientStackManager(m_clientstackDll); | ||
562 | } | ||
563 | |||
556 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, | 564 | protected override Scene CreateScene(RegionInfo regionInfo, StorageManager storageManager, |
557 | AgentCircuitManager circuitManager) | 565 | AgentCircuitManager circuitManager) |
558 | { | 566 | { |