diff options
| author | Justin Clark-Casey (justincc) | 2013-03-28 02:23:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-03-28 02:23:09 +0000 |
| commit | afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f (patch) | |
| tree | 7d482d093ea9f5a81146509b9fb9cc903c328b31 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
| parent | Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region... (diff) | |
| download | opensim-SC_OLD-afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f.zip opensim-SC_OLD-afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f.tar.gz opensim-SC_OLD-afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f.tar.bz2 opensim-SC_OLD-afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f.tar.xz | |
minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 8a16943..f351da6 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -256,10 +256,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 256 | 256 | ||
| 257 | public virtual void RemoveRegion(Scene scene) | 257 | public virtual void RemoveRegion(Scene scene) |
| 258 | { | 258 | { |
| 259 | StatsManager.DeregisterStat(m_interRegionTeleportAttempts); | 259 | if (m_Enabled) |
| 260 | StatsManager.DeregisterStat(m_interRegionTeleportAborts); | 260 | { |
| 261 | StatsManager.DeregisterStat(m_interRegionTeleportCancels); | 261 | StatsManager.DeregisterStat(m_interRegionTeleportAttempts); |
| 262 | StatsManager.DeregisterStat(m_interRegionTeleportFailures); | 262 | StatsManager.DeregisterStat(m_interRegionTeleportAborts); |
| 263 | StatsManager.DeregisterStat(m_interRegionTeleportCancels); | ||
| 264 | StatsManager.DeregisterStat(m_interRegionTeleportFailures); | ||
| 265 | } | ||
| 263 | } | 266 | } |
| 264 | 267 | ||
| 265 | public virtual void RegionLoaded(Scene scene) | 268 | public virtual void RegionLoaded(Scene scene) |