diff options
| author | KittoFlora | 2009-11-02 21:53:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-02 21:53:51 +0100 |
| commit | 2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch) | |
| tree | e44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /OpenSim/Client/MXP/MXPModule.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Removing Console.WriteLine()s that were brought in with the revert (diff) | |
| download | opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2 opensim-SC-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Client/MXP/MXPModule.cs')
| -rw-r--r-- | OpenSim/Client/MXP/MXPModule.cs | 7 |
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 |