7 files changed, 87 insertions, 87 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index fea6b2b..860f5fb 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Environment.Scenes
         #region Events
 
         public event PhysicsCrash UnRecoverableError;
-        private PhysicsCrash handler001 = null;
+        private PhysicsCrash handlerPhysicsCrash = null;
 
         #endregion
 
@@ -716,10 +716,10 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void physicsBasedCrash()
         {
-            handler001 = UnRecoverableError;
-            if (handler001 != null)
+            handlerPhysicsCrash = UnRecoverableError;
+            if (handlerPhysicsCrash != null)
             {
-                handler001();
+                handlerPhysicsCrash();
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 3371912..3f7edfb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -160,9 +160,9 @@ namespace OpenSim.Region.Environment.Scenes
         public virtual void Restart(int seconds)
         {
             m_log.Error("[REGION]: passing Restart Message up the namespace");
-            restart handler001 = OnRestart;
-            if (handler001 != null) 
-                handler001(RegionInfo);
+            restart handlerPhysicsCrash = OnRestart;
+            if (handlerPhysicsCrash != null)
+                handlerPhysicsCrash(RegionInfo);
         }
 
         public virtual bool PresenceChildStatus(LLUUID avatarID)
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 8678f7a..75e3cfd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -58,14 +58,14 @@ namespace OpenSim.Region.Environment.Scenes
         public event ChildAgentUpdate OnChildAgentUpdate;
         public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar;
 
-        private AgentCrossing handler001 = null; // OnAvatarCrossingIntoRegion;
-        private ExpectUserDelegate handler002 = null; // OnExpectUser;
-        private ExpectPrimDelegate handler003 = null; // OnExpectPrim;
-        private CloseAgentConnection handler004 = null; // OnCloseAgentConnection;
-        private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion;
-        private RegionUp handler006 = null; // OnRegionUp;
-        private ChildAgentUpdate handler007 = null; // OnChildAgentUpdate;
-        private RemoveKnownRegionsFromAvatarList handler008 = null; // OnRemoveKnownRegionFromAvatar;
+        private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
+        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;
+        private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
+        private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
+        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
+        private RegionUp handlerRegionUp = null; // OnRegionUp;
+        private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
+        private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
 
         public KillObjectDelegate KillObject;
         public string _debugRegionName = String.Empty;
@@ -132,30 +132,30 @@ namespace OpenSim.Region.Environment.Scenes
         ///
         protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
         {
-            handler002 = OnExpectUser;
-            if (handler002 != null)
+            handlerExpectUser = OnExpectUser;
+            if (handlerExpectUser != null)
             {
                 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname);
-                handler002(regionHandle, agent);
+                handlerExpectUser(regionHandle, agent);
             }
         }
 
         protected bool newRegionUp(RegionInfo region)
         {
-            handler006 = OnRegionUp;
-            if (handler006 != null)
+            handlerRegionUp = OnRegionUp;
+            if (handlerRegionUp != null)
             {
                 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName);
-                handler006(region);
+                handlerRegionUp(region);
             }
             return true;
         }
 
         protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData)
         {
-            handler007 = OnChildAgentUpdate;
-            if (handler007 != null)
-                handler007(regionHandle, cAgentData);
+            handlerChildAgentUpdate = OnChildAgentUpdate;
+            if (handlerChildAgentUpdate != null)
+                handlerChildAgentUpdate(regionHandle, cAgentData);
 
 
             return true;
@@ -163,39 +163,39 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
-            handler001 = OnAvatarCrossingIntoRegion;
-            if (handler001 != null)
+            handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
+            if (handlerAvatarCrossingIntoRegion != null)
             {
-                handler001(regionHandle, agentID, position, isFlying);
+                handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
             }
         }
 
         protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData)
         {
-            handler003 = OnExpectPrim;
-            if (handler003 != null)
+            handlerExpectPrim = OnExpectPrim;
+            if (handlerExpectPrim != null)
             {
-                handler003(regionHandle, primID, objXMLData);
+                handlerExpectPrim(regionHandle, primID, objXMLData);
             }
 
         }
 
         protected void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
         {
-            handler005 = OnPrimCrossingIntoRegion;
-            if (handler005 != null)
+            handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
+            if (handlerPrimCrossingIntoRegion != null)
             {
-                handler005(regionHandle, primID, position, isPhysical);
+                handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical);
             }
         }
 
         protected bool CloseConnection(ulong regionHandle, LLUUID agentID)
         {
             m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString());
-            handler004 = OnCloseAgentConnection;
-            if (handler004 != null)
+            handlerCloseAgentConnection = OnCloseAgentConnection;
+            if (handlerCloseAgentConnection != null)
             {
-                return handler004(regionHandle, agentID);
+                return handlerCloseAgentConnection(regionHandle, agentID);
             }
             return false;
         }
@@ -437,10 +437,10 @@ namespace OpenSim.Region.Environment.Scenes
             // We remove the list of known regions from the agent's known region list through an event
             // to scene, because, if an agent logged of, it's likely that there will be no scene presence
             // by the time we get to this part of the method.
-            handler008 = OnRemoveKnownRegionFromAvatar;
-            if (handler008 != null)
+            handlerRemoveKnownRegionFromAvatar = OnRemoveKnownRegionFromAvatar;
+            if (handlerRemoveKnownRegionFromAvatar != null)
             {
-                handler008(agentID, regionlst);
+                handlerRemoveKnownRegionFromAvatar(agentID, regionlst);
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 96b3ccb..ac8f91e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -164,15 +164,15 @@ namespace OpenSim.Region.Environment.Scenes
 
         /* Designated Event Deletage Instances */
 
-        private ScriptChangedEvent handler001 = null; //OnScriptChangedEvent;
-        private ClientMovement handler002 = null; //OnClientMovement;
-        private OnPermissionErrorDelegate handler003 = null; //OnPermissionError;
-        private OnPluginConsoleDelegate handler004 = null; //OnPluginConsole;
-        private OnFrameDelegate handler005 = null; //OnFrame;
-        private OnNewClientDelegate handler006 = null; //OnNewClient;
-        private OnNewPresenceDelegate handler007 = null; //OnNewPresence;
-        private OnRemovePresenceDelegate handler008 = null; //OnRemovePresence;
-        private OnBackupDelegate handler009 = null; //OnBackup;
+        private ScriptChangedEvent handlerScriptChangedEvent = null; //OnScriptChangedEvent;
+        private ClientMovement handlerClientMovement = null; //OnClientMovement;
+        private OnPermissionErrorDelegate handlerPermissionError = null; //OnPermissionError;
+        private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole;
+        private OnFrameDelegate handlerFrame = null; //OnFrame;
+        private OnNewClientDelegate handlerNewClient = null; //OnNewClient;
+        private OnNewPresenceDelegate handlerNewPresence = null; //OnNewPresence;
+        private OnRemovePresenceDelegate handlerRemovePresence = null; //OnRemovePresence;
+        private OnBackupDelegate handlerBackup = null; //OnBackup;
         private OnParcelPrimCountUpdateDelegate handlerParcelPrimCountUpdate = null; //OnParcelPrimCountUpdate;
         private MoneyTransferEvent handlerMoneyTransfer = null; //OnMoneyTransfer;
         private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd;
@@ -192,70 +192,70 @@ namespace OpenSim.Region.Environment.Scenes
 
         public void TriggerOnScriptChangedEvent(uint localID, uint change)
         {
-            handler001 = OnScriptChangedEvent;
-            if (handler001 != null)
-                handler001(localID, change);
+            handlerScriptChangedEvent = OnScriptChangedEvent;
+            if (handlerScriptChangedEvent != null)
+                handlerScriptChangedEvent(localID, change);
         }
 
         public void TriggerOnClientMovement(ScenePresence avatar)
         {
-            handler002 = OnClientMovement;
-            if (handler002 != null)
-                handler002(avatar);
+            handlerClientMovement = OnClientMovement;
+            if (handlerClientMovement != null)
+                handlerClientMovement(avatar);
         }
 
         public void TriggerPermissionError(LLUUID user, string reason)
         {
-            handler003 = OnPermissionError;
-            if (handler003 != null)
-                handler003(user, reason);
+            handlerPermissionError = OnPermissionError;
+            if (handlerPermissionError != null)
+                handlerPermissionError(user, reason);
         }
 
         public void TriggerOnPluginConsole(string[] args)
         {
-            handler004 = OnPluginConsole;
-            if (handler004 != null)
-                handler004(args);
+            handlerPluginConsole = OnPluginConsole;
+            if (handlerPluginConsole != null)
+                handlerPluginConsole(args);
         }
 
         public void TriggerOnFrame()
         {
-            handler005 = OnFrame;
-            if (handler005 != null)
+            handlerFrame = OnFrame;
+            if (handlerFrame != null)
             {
-                handler005();
+                handlerFrame();
             }
         }
 
         public void TriggerOnNewClient(IClientAPI client)
         {
-            handler006 = OnNewClient;
-            if (handler006 != null)
-                handler006(client);
+            handlerNewClient = OnNewClient;
+            if (handlerNewClient != null)
+                handlerNewClient(client);
         }
 
         public void TriggerOnNewPresence(ScenePresence presence)
         {
-            handler007 = OnNewPresence;
-            if (handler007 != null)
-                handler007(presence);
+            handlerNewPresence = OnNewPresence;
+            if (handlerNewPresence != null)
+                handlerNewPresence(presence);
         }
 
         public void TriggerOnRemovePresence(LLUUID agentId)
         {
-            handler008 = OnRemovePresence;
-            if (handler008 != null)
+            handlerRemovePresence = OnRemovePresence;
+            if (handlerRemovePresence != null)
             {
-                handler008(agentId);
+                handlerRemovePresence(agentId);
             }
         }
 
         public void TriggerOnBackup(IRegionDataStore dstore)
         {
-            handler009 = OnBackup;
-            if (handler009 != null)
+            handlerBackup = OnBackup;
+            if (handlerBackup != null)
             {
-                handler009(dstore);
+                handlerBackup(dstore);
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 713c3ba..4cc130e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Scenes
         protected ulong m_regionHandle;
 
         public event PrimCountTaintedDelegate OnPrimCountTainted;
-        private PrimCountTaintedDelegate handler001 = null;
+        private PrimCountTaintedDelegate handlerPrimCountTainted = null;
 
         /// <summary>
         /// Signal whether the non-inventory attributes of any prims in the group have changed 
@@ -1534,10 +1534,10 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         public void TriggerTainted()
         {
-            handler001 =  OnPrimCountTainted;
-            if (handler001 != null)
+            handlerPrimCountTainted = OnPrimCountTainted;
+            if (handlerPrimCountTainted != null)
             {
-                handler001();
+                handlerPrimCountTainted();
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index ef23432..2c201ba 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Environment.Scenes
         private readonly List<ulong> m_knownChildRegions = new List<ulong>();
                                      //neighbouring regions we have enabled a child agent in
 
-        private SignificantClientMovement handler001 = null; //OnSignificantClientMovement;
+        private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement;
 
 
         /// <summary>
@@ -1484,10 +1484,10 @@ namespace OpenSim.Region.Environment.Scenes
             if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5)
             {
                 posLastSignificantMove = AbsolutePosition;
-                handler001 = OnSignificantClientMovement;
-                if (handler001 != null)
+                handlerSignificantClientMovement = OnSignificantClientMovement;
+                if (handlerSignificantClientMovement != null)
                 {
-                    handler001(m_controllingClient);
+                    handlerSignificantClientMovement(m_controllingClient);
                     m_scene.NotifyMyCoarseLocationChange();
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
index d4868f3..382618b 100644
--- a/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Environment/Scenes/SimStatsReporter.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public event SendStatResult OnSendStatsResult;
 
-        private SendStatResult handler001 = null;
+        private SendStatResult handlerSendStatResult = null;
 
         private enum Stats : uint
         {
@@ -247,10 +247,10 @@ namespace OpenSim.Region.Environment.Scenes
 
             statpack.Stat = sb;
 
-            handler001 = OnSendStatsResult;
-            if (handler001 != null)
+            handlerSendStatResult = OnSendStatsResult;
+            if (handlerSendStatResult != null)
             {
-                handler001(statpack);
+                handlerSendStatResult(statpack);
             }
             resetvalues();
             m_report.Enabled = true;