diff options
| author | Melanie | 2009-10-27 11:32:11 +0000 |
|---|---|---|
| committer | Melanie | 2009-10-27 11:32:11 +0000 |
| commit | 31a848e97bd984ab0a85feca397ce419f6ae839a (patch) | |
| tree | 4743f5eb7c12b3723ed4b986d19714d1b3a0a3ea /OpenSim/Client/MXP/MXPModule.cs | |
| parent | Commented out instrumentation in ODEPrim.cs (diff) | |
| parent | Finally hunted down the Parallel deadlock. Packets were being handled asynchr... (diff) | |
| download | opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.zip opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.gz opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.bz2 opensim-SC-31a848e97bd984ab0a85feca397ce419f6ae839a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Client/MXP/MXPModule.cs')
| -rw-r--r-- | OpenSim/Client/MXP/MXPModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs index 2d28b8c..a6b0396 100644 --- a/OpenSim/Client/MXP/MXPModule.cs +++ b/OpenSim/Client/MXP/MXPModule.cs | |||
| @@ -52,10 +52,10 @@ namespace OpenSim.Client.MXP | |||
| 52 | 52 | ||
| 53 | private IConfigSource m_config; | 53 | private IConfigSource m_config; |
| 54 | private int m_port = 1253; | 54 | private int m_port = 1253; |
| 55 | private Timer m_ticker; | ||
| 55 | 56 | ||
| 56 | private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | 57 | private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); |
| 57 | private readonly Timer m_ticker = new Timer(100); | 58 | private bool m_shutdown; |
| 58 | private bool m_shutdown = false; | ||
| 59 | 59 | ||
| 60 | public void Initialise(Scene scene, IConfigSource source) | 60 | public void Initialise(Scene scene, IConfigSource source) |
| 61 | { | 61 | { |
| @@ -78,6 +78,7 @@ namespace OpenSim.Client.MXP | |||
| 78 | 78 | ||
| 79 | m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true)); | 79 | m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true)); |
| 80 | 80 | ||
| 81 | m_ticker = new Timer(100); | ||
| 81 | m_ticker.AutoReset = false; | 82 | m_ticker.AutoReset = false; |
| 82 | m_ticker.Elapsed += ticker_Elapsed; | 83 | m_ticker.Elapsed += ticker_Elapsed; |
| 83 | 84 | ||