aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-30 13:18:38 -0700
committerJohn Hurliman2009-10-30 13:18:38 -0700
commitf5e470d4ba7cf3bc68d9997a411b95f4621391cf (patch)
treec1a1f227f5823525f245409f552af1090f0464f3 /OpenSim
parentFixed a regression in SendAvatarGroupsReply() (diff)
parentSquelch an error message on sim shutdown when not using MXP (diff)
downloadopensim-SC_OLD-f5e470d4ba7cf3bc68d9997a411b95f4621391cf.zip
opensim-SC_OLD-f5e470d4ba7cf3bc68d9997a411b95f4621391cf.tar.gz
opensim-SC_OLD-f5e470d4ba7cf3bc68d9997a411b95f4621391cf.tar.bz2
opensim-SC_OLD-f5e470d4ba7cf3bc68d9997a411b95f4621391cf.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/MXP/MXPModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index a6b0396..0b442cc 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -110,8 +110,11 @@ namespace OpenSim.Client.MXP
110 public void Close() 110 public void Close()
111 { 111 {
112 m_shutdown = true; 112 m_shutdown = true;
113 lock (m_ticker) 113 if (m_ticker != null)
114 m_ticker.Stop(); 114 {
115 lock (m_ticker)
116 m_ticker.Stop();
117 }
115 } 118 }
116 119
117 public string Name 120 public string Name