Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.6.8-post-fixes
John Hurliman 2009-10-30 13:18:38 -07:00
commit f5e470d4ba
1 changed files with 5 additions and 2 deletions

View File

@ -110,8 +110,11 @@ namespace OpenSim.Client.MXP
public void Close()
{
m_shutdown = true;
lock (m_ticker)
m_ticker.Stop();
if (m_ticker != null)
{
lock (m_ticker)
m_ticker.Stop();
}
}
public string Name