diff options
| author | UbitUmarov | 2016-11-19 15:45:41 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-19 15:45:41 +0000 |
| commit | 7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4 (patch) | |
| tree | a2ab69bce5eda122b119da082625449f92b4c3d3 /OpenSim/Capabilities/Caps.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | REST console v2. This is an incompatible protocol change. It degrades gracefu... (diff) | |
| download | opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.zip opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.gz opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.bz2 opensim-SC-7cb3d583a97ac36f0c2ef5d6eadae28f26378fc4.tar.xz | |
merge conflits
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Capabilities/Caps.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 3efab8e..5e89c38 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
| @@ -141,6 +141,11 @@ namespace OpenSim.Framework.Capabilities | |||
| 141 | m_capsActive.Reset(); | 141 | m_capsActive.Reset(); |
| 142 | } | 142 | } |
| 143 | 143 | ||
| 144 | ~Caps() | ||
| 145 | { | ||
| 146 | m_capsActive.Dispose(); | ||
| 147 | } | ||
| 148 | |||
| 144 | /// <summary> | 149 | /// <summary> |
| 145 | /// Register a handler. This allows modules to register handlers. | 150 | /// Register a handler. This allows modules to register handlers. |
| 146 | /// </summary> | 151 | /// </summary> |