diff options
| author | Melanie | 2009-10-30 18:08:58 +0000 |
|---|---|---|
| committer | Melanie | 2009-10-30 18:08:58 +0000 |
| commit | 8a6442173589a0e267dbacb50f8d22c6b57280c1 (patch) | |
| tree | 0f6db4cfa7ff6d8c1350e83c3fdc03890c0f3755 /OpenSim | |
| parent | * Disables automatic packet splitting on AvatarGroupsReply packets. This pack... (diff) | |
| download | opensim-SC_OLD-8a6442173589a0e267dbacb50f8d22c6b57280c1.zip opensim-SC_OLD-8a6442173589a0e267dbacb50f8d22c6b57280c1.tar.gz opensim-SC_OLD-8a6442173589a0e267dbacb50f8d22c6b57280c1.tar.bz2 opensim-SC_OLD-8a6442173589a0e267dbacb50f8d22c6b57280c1.tar.xz | |
Squelch an error message on sim shutdown when not using MXP
Diffstat (limited to 'OpenSim')
| -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 |