aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-23 14:22:21 -0700
committerJohn Hurliman2009-10-23 14:22:21 -0700
commit2c34619aea074446e53dde80d397973075914bac (patch)
tree57dc6b70a33df038b334e8632caa084c02ded5ce /OpenSim/Client/MXP
parent* Change the way Util.FireAndForget() calls SmartThreadPool to avoid using a ... (diff)
downloadopensim-SC_OLD-2c34619aea074446e53dde80d397973075914bac.zip
opensim-SC_OLD-2c34619aea074446e53dde80d397973075914bac.tar.gz
opensim-SC_OLD-2c34619aea074446e53dde80d397973075914bac.tar.bz2
opensim-SC_OLD-2c34619aea074446e53dde80d397973075914bac.tar.xz
* Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
Diffstat (limited to 'OpenSim/Client/MXP')
-rw-r--r--OpenSim/Client/MXP/MXPModule.cs5
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