aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client/MXP/MXPModule.cs
diff options
context:
space:
mode:
authorCharles Krinke2009-04-22 19:27:35 +0000
committerCharles Krinke2009-04-22 19:27:35 +0000
commit0f08f4cc4b10ec0e6ffa9bbce821a0d9ed7670e0 (patch)
tree286034015c9d3f33c7c603924191a9a42c91f96a /OpenSim/Client/MXP/MXPModule.cs
parent* Allow plugins to play nicely in UserManagerBase (diff)
downloadopensim-SC-0f08f4cc4b10ec0e6ffa9bbce821a0d9ed7670e0.zip
opensim-SC-0f08f4cc4b10ec0e6ffa9bbce821a0d9ed7670e0.tar.gz
opensim-SC-0f08f4cc4b10ec0e6ffa9bbce821a0d9ed7670e0.tar.bz2
opensim-SC-0f08f4cc4b10ec0e6ffa9bbce821a0d9ed7670e0.tar.xz
Thank you kindly, TLaukkan, for a patch that:
Adds connectivity to grid regions. * Fixed UserService cast. * Added exception handling to avoid mxp message handling thread to exit and hang the module on unhandled exception.
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/MXP/MXPModule.cs11
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index 082bcc3..dbe4174 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -83,13 +83,20 @@ namespace OpenSim.Client.MXP
83 83
84 m_ticker.Start(); 84 m_ticker.Start();
85 85
86 m_log.Info("[MXP] MXP Enabled and Listening"); 86 m_log.Info("[MXP ClientStack] MXP Enabled and Listening");
87 } 87 }
88 } 88 }
89 89
90 void ticker_Elapsed(object sender, ElapsedEventArgs e) 90 void ticker_Elapsed(object sender, ElapsedEventArgs e)
91 { 91 {
92 m_server.Process(); 92 try
93 {
94 m_server.Process();
95 }
96 catch (Exception ex)
97 {
98 m_log.Error("[MXP ClientStack]: Unhandled exception in process loop: " + ex.ToString() + " :" + ex.StackTrace.ToString());
99 }
93 100
94 if (!m_shutdown) 101 if (!m_shutdown)
95 m_ticker.Start(); 102 m_ticker.Start();