From afd0d6af0710375bf566ef5a6fcf00e7d1c5ca0f Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Thu, 28 Mar 2013 02:23:09 +0000
Subject: [PATCH] minor: Only try to deregister stats in
 EntityTransferModule.RemoveRegion() if module was enabled.

---
 .../Framework/EntityTransfer/EntityTransferModule.cs  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 8a1694396d..f351da6d78 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
 
         public virtual void RemoveRegion(Scene scene) 
         {
-            StatsManager.DeregisterStat(m_interRegionTeleportAttempts);
-            StatsManager.DeregisterStat(m_interRegionTeleportAborts);
-            StatsManager.DeregisterStat(m_interRegionTeleportCancels);
-            StatsManager.DeregisterStat(m_interRegionTeleportFailures);
+            if (m_Enabled)
+            {
+                StatsManager.DeregisterStat(m_interRegionTeleportAttempts);
+                StatsManager.DeregisterStat(m_interRegionTeleportAborts);
+                StatsManager.DeregisterStat(m_interRegionTeleportCancels);
+                StatsManager.DeregisterStat(m_interRegionTeleportFailures);
+            }
         }
 
         public virtual void RegionLoaded(Scene scene)