aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP/MXPModule.cs
diff options
context:
space:
mode:
authorHomer Horwitz2009-03-15 21:34:28 +0000
committerHomer Horwitz2009-03-15 21:34:28 +0000
commitabc5df12c883ab14bf7926fc047431249ba52cb5 (patch)
treeff9042dde59b02e97b1ed2ebe6e39c7db855c615 /OpenSim/Client/MXP/MXPModule.cs
parentregionInfo isn't defined here yet, which leads to a NRE. Grid-server (diff)
downloadopensim-SC_OLD-abc5df12c883ab14bf7926fc047431249ba52cb5.zip
opensim-SC_OLD-abc5df12c883ab14bf7926fc047431249ba52cb5.tar.gz
opensim-SC_OLD-abc5df12c883ab14bf7926fc047431249ba52cb5.tar.bz2
opensim-SC_OLD-abc5df12c883ab14bf7926fc047431249ba52cb5.tar.xz
This patch improves MXP connect and disconnect functionality.
- Avatars are now properly on top of terrain. - ScenePresence is now removed from Scene only once. Fixes Mantis #3302. Thanks tlaukkan.
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/MXP/MXPModule.cs18
1 files changed, 5 insertions, 13 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index 6ec7744..4eb0058 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -38,21 +38,20 @@ using OpenSim.Region.Framework.Scenes;
38 38
39namespace OpenSim.Client.MXP 39namespace OpenSim.Client.MXP
40{ 40{
41
41 /** 42 /**
42 * MXP Client Module which adds MXP support to client / region communication. 43 * MXP Client Module which adds MXP support to client / region communication.
43 */ 44 */
44 public class MXPModule : IRegionModule 45 public class MXPModule : IRegionModule
45 { 46 {
47 private MXPPacketServer m_server;
46 48
49 private IConfigSource m_config;
47 private int m_port = 1253; 50 private int m_port = 1253;
48 //private int m_ticks = 0;
49 private bool m_shutdown = false;
50 51
51 private IConfigSource m_config;
52 private readonly Timer m_ticker = new Timer(100);
53 private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); 52 private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
54 53 private readonly Timer m_ticker = new Timer(100);
55 private MXPPacketServer m_server; 54 private bool m_shutdown = false;
56 55
57 public void Initialise(Scene scene, IConfigSource source) 56 public void Initialise(Scene scene, IConfigSource source)
58 { 57 {
@@ -88,13 +87,6 @@ namespace OpenSim.Client.MXP
88 87
89 if (!m_shutdown) 88 if (!m_shutdown)
90 m_ticker.Start(); 89 m_ticker.Start();
91
92 // Commenting this at because of the excess flood to log.
93 // TODO: Add ini file option.
94 /*if (++ticks % 100 == 0)
95 {
96 server.PrintDebugInformation();
97 }*/
98 } 90 }
99 91
100 public void Close() 92 public void Close()