14 files changed, 217 insertions, 217 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 0eb144c..8f41d62 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities
         public class AssetUploader
         {
             public event UpLoadedAsset OnUpLoad;
-            private UpLoadedAsset handler001 = null;
+            private UpLoadedAsset handlerUpLoad = null;
 
             private string uploaderPath = String.Empty;
             private LLUUID newAssetID;
@@ -529,10 +529,10 @@ namespace OpenSim.Region.Capabilities
                 {
                     SaveAssetToFile(m_assetName + ".jp2", data);
                 }
-                handler001 = OnUpLoad;
-                if (handler001 != null)
+                handlerUpLoad = OnUpLoad;
+                if (handlerUpLoad != null)
                 {
-                    handler001(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
+                    handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
                 }
 
                 return res;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.Capabilities
         {
             public event UpdateItem OnUpLoad;
 
-            private UpdateItem handler001 = null;
+            private UpdateItem handlerUpdateItem = null;
 
             private string uploaderPath = String.Empty;
             private LLUUID inventoryItemID;
@@ -598,10 +598,10 @@ namespace OpenSim.Region.Capabilities
                 string res = String.Empty;
                 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
                 LLUUID assetID = LLUUID.Zero;
-                handler001 = OnUpLoad;
-                if (handler001 != null)
+                handlerUpdateItem = OnUpLoad;
+                if (handlerUpdateItem != null)
                 {
-                    assetID = handler001(inv, data);
+                    assetID = handlerUpdateItem(inv, data);
                 }
 
                 uploadComplete.new_asset = assetID.ToString();
@@ -651,7 +651,7 @@ namespace OpenSim.Region.Capabilities
         {
             public event UpdateTaskScript OnUpLoad;
 
-            private UpdateTaskScript handler001 = null;
+            private UpdateTaskScript handlerUpdateTaskScript = null;
 
             private string uploaderPath = String.Empty;
             private LLUUID inventoryItemID;
@@ -693,10 +693,10 @@ namespace OpenSim.Region.Capabilities
                     string res = String.Empty;
                     LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
 
-                    handler001 = OnUpLoad;
-                    if (handler001 != null)
+                    handlerUpdateTaskScript = OnUpLoad;
+                    if (handlerUpdateTaskScript != null)
                     {
-                        handler001(inventoryItemID, primID, isScriptRunning, data);
+                        handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);
                     }
 
                     uploadComplete.item_id = inventoryItemID;
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 4d9411d..22750b9 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -46,15 +46,15 @@ namespace OpenSim.Framework
         public event RegionUp OnRegionUp;
         public event ChildAgentUpdate OnChildAgentUpdate;
 
-        private ExpectUserDelegate handler001 = null; // OnExpectUser
-        private ExpectPrimDelegate handler002 = null; // OnExpectPrim;
-        private GenericCall2 handler003 = null; // OnExpectChildAgent;
-        private AgentCrossing handler004 = null; // OnAvatarCrossingIntoRegion;
-        private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion;
-        private UpdateNeighbours handler006 = null; // OnNeighboursUpdate;
-        private AcknowledgeAgentCross handler007 = null; // OnAcknowledgeAgentCrossed;
-        private AcknowledgePrimCross handler008 = null; // OnAcknowledgePrimCrossed;
-        private CloseAgentConnection handler009 = null; // OnCloseAgentConnection;
+        private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
+        private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
+        private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
+        private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
+        private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
+        private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
+        private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
+        private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
+        private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
         private RegionUp handlerRegionUp = null; // OnRegionUp;
         private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
 
@@ -68,10 +68,10 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
         {
-            handler001 = OnExpectUser;
-            if (handler001 != null)
+            handlerExpectUser = OnExpectUser;
+            if (handlerExpectUser != null)
             {
-                handler001(regionHandle, agent);
+                handlerExpectUser(regionHandle, agent);
                 return true;
             }
 
@@ -81,10 +81,10 @@ namespace OpenSim.Framework
 
         public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
         {
-            handler002 = OnExpectPrim;
-            if (handler002 != null)
+            handlerExpectPrim = OnExpectPrim;
+            if (handlerExpectPrim != null)
             {
-                handler002(regionHandle, primID, objData);
+                handlerExpectPrim(regionHandle, primID, objData);
                 return true;
             }
             return false;
@@ -115,10 +115,10 @@ namespace OpenSim.Framework
         public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
                                                         bool isFlying)
         {
-            handler004 = OnAvatarCrossingIntoRegion;
-            if (handler004 != null)
+            handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
+            if (handlerAvatarCrossingIntoRegion != null)
             {
-                handler004(regionHandle, agentID, position, isFlying);
+                handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
                 return true;
             }
             return false;
@@ -127,10 +127,10 @@ namespace OpenSim.Framework
         public virtual bool TriggerExpectPrimCrossing(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);
                 return true;
             }
             return false;
@@ -138,10 +138,10 @@ namespace OpenSim.Framework
 
         public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID)
         {
-            handler007 = OnAcknowledgeAgentCrossed;
-            if (handler007 != null)
+            handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed;
+            if (handlerAcknowledgeAgentCrossed != null)
             {
-                handler007(regionHandle, agentID);
+                handlerAcknowledgeAgentCrossed(regionHandle, agentID);
                 return true;
             }
             return false;
@@ -149,10 +149,10 @@ namespace OpenSim.Framework
 
         public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID)
         {
-            handler008 = OnAcknowledgePrimCrossed;
-            if (handler008 != null)
+            handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed;
+            if (handlerAcknowledgePrimCrossed != null)
             {
-                handler008(regionHandle, primID);
+                handlerAcknowledgePrimCrossed(regionHandle, primID);
                 return true;
             }
             return false;
@@ -160,10 +160,10 @@ namespace OpenSim.Framework
 
         public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
         {
-            handler009 = OnCloseAgentConnection;
-            if (handler009 != null)
+            handlerCloseAgentConnection = OnCloseAgentConnection;
+            if (handlerCloseAgentConnection != null)
             {
-                handler009(regionHandle, agentID);
+                handlerCloseAgentConnection(regionHandle, agentID);
                 return true;
 
             }
@@ -177,10 +177,10 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public virtual bool TriggerExpectChildAgent()
         {
-            handler003 = OnExpectChildAgent;
-            if (handler003 != null)
+            handlerExpectChildAgent = OnExpectChildAgent;
+            if (handlerExpectChildAgent != null)
             {
-                handler003();
+                handlerExpectChildAgent();
                 return true;
             }
 
@@ -195,10 +195,10 @@ namespace OpenSim.Framework
         /// <returns></returns>
         public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
         {
-            handler006 = OnNeighboursUpdate;
-            if (handler006 != null)
+            handlerNeighboursUpdate = OnNeighboursUpdate;
+            if (handlerNeighboursUpdate != null)
             {
-                handler006(neighbours);
+                handlerNeighboursUpdate(neighbours);
                 return true;
             }
 
@@ -207,9 +207,9 @@ namespace OpenSim.Framework
 
         public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
         {
-            handler009 = OnCloseAgentConnection;
-            if (handler009 != null)
-                return handler009(regionHandle, agentID);
+            handlerCloseAgentConnection = OnCloseAgentConnection;
+            if (handlerCloseAgentConnection != null)
+                return handlerCloseAgentConnection(regionHandle, agentID);
 
             return false;
         }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 143c990..0b832f4 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Grid.UserServer
 
         public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
 
-        private UserLoggedInAtLocation handler001 = null;
+        private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null;
        
         public UserConfig m_config;
 
@@ -147,11 +147,11 @@ namespace OpenSim.Grid.UserServer
                         "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 
                         SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
                 }
-                handler001 = OnUserLoggedInAtLocation;
-                if (handler001 != null)
+                handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
+                if (handlerUserLoggedInAtLocation != null)
                 {
                     m_log.Info("[LOGIN]: Letting other objects know about login");
-                    handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, 
+                    handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, 
                         theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z,
                         theUser.username,theUser.surname);
                 }
@@ -226,11 +226,11 @@ namespace OpenSim.Grid.UserServer
                     // Send
                     XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
                     XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
-                    handler001 = OnUserLoggedInAtLocation;
-                    if (handler001 != null)
+                    handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
+                    if (handlerUserLoggedInAtLocation != null)
                     {
                         m_log.Info("[LOGIN]: Letting other objects know about login");
-                        handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion,
+                        handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion,
                         theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z,
                         theUser.username, theUser.surname);
                     }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5806f5f..367b5d7 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.UserServer
     {            
         private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
         public event logOffUser OnLogOffUser;
-        private logOffUser handler001 = null;
+        private logOffUser handlerLogOffUser = null;
         /// <summary>
         /// Deletes an active agent session
         /// </summary>
@@ -331,9 +331,9 @@ namespace OpenSim.Grid.UserServer
                     float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]);
                     float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]);
 
-                    handler001 = OnLogOffUser;
-                    if (handler001 != null)
-                        handler001(userUUID);
+                    handlerLogOffUser = OnLogOffUser;
+                    if (handlerLogOffUser != null)
+                        handlerLogOffUser(userUUID);
 
                     LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz);
                 }
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index eb50042..d032a2e 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -122,15 +122,15 @@ namespace OpenSim.Region.ClientStack
         /* Instantiated Designated Event Delegates */
         //- used so we don't create new objects for each incoming packet and then toss it out later */
 
-        private RequestAvatarProperties handler001 = null; //OnRequestAvatarProperties;
-        private ChatFromViewer handler002 = null; //OnChatFromViewer;
-        private ChatFromViewer handler003 = null; //OnChatFromViewer;
-        private ImprovedInstantMessage handler004 = null; //OnInstantMessage;
-        private FriendActionDelegate handler005 = null; //OnApproveFriendRequest;
-        private FriendshipTermination handler006 = null; //OnTerminateFriendship;
-        private RezObject handler007 = null; //OnRezObject;
-        private GenericCall4 handler008 = null; //OnDeRezObject;
-        private ModifyTerrain handler009 = null;
+        private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
+        private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer;
+        private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer;
+        private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
+        private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest;
+        private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship;
+        private RezObject handlerRezObject = null; //OnRezObject;
+        private GenericCall4 handlerDeRezObject = null; //OnDeRezObject;
+        private ModifyTerrain handlerModifyTerrain = null;
         private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
         private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
         private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
@@ -2866,10 +2866,10 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.AvatarPropertiesRequest:
                         AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
 
-                        handler001 = OnRequestAvatarProperties;
-                        if (handler001 != null)
+                        handlerRequestAvatarProperties = OnRequestAvatarProperties;
+                        if (handlerRequestAvatarProperties != null)
                         {
-                            handler001(this, avatarProperties.AgentData.AvatarID);
+                            handlerRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID);
                         }
 
 
@@ -2897,9 +2897,9 @@ namespace OpenSim.Region.ClientStack
                             args.Scene = Scene;
                             args.Sender = this;
 
-                            handler002 = OnChatFromViewer;
-                            if (handler002 != null)
-                                handler002(this, args);
+                            handlerChatFromViewer = OnChatFromViewer;
+                            if (handlerChatFromViewer != null)
+                                handlerChatFromViewer(this, args);
                         }
 
 
@@ -2919,9 +2919,9 @@ namespace OpenSim.Region.ClientStack
                             args.Position = new LLVector3();
                             args.Scene = Scene;
                             args.Sender = this;
-                            handler003 = OnChatFromViewer;
-                            if (handler003 != null)
-                                handler003(this, args);
+                            handlerChatFromViewer2 = OnChatFromViewer;
+                            if (handlerChatFromViewer2 != null)
+                                handlerChatFromViewer2(this, args);
                         }
 
                         break;
@@ -2929,11 +2929,11 @@ namespace OpenSim.Region.ClientStack
                         ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
                         string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
                         string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message);
-                        handler004 = OnInstantMessage;
+                        handlerInstantMessage = OnInstantMessage;
 
-                        if (handler004 != null)
+                        if (handlerInstantMessage != null)
                         {
-                            handler004(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
+                            handlerInstantMessage(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
                                              msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
                                              msgpack.MessageBlock.Timestamp, IMfromName, IMmessage,
                                              msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup,
@@ -2959,10 +2959,10 @@ namespace OpenSim.Region.ClientStack
                             callingCardFolders.Add(afriendpack.FolderData[fi].FolderID);
                         }
 
-                        handler005 = OnApproveFriendRequest;
-                        if (handler005 != null)
+                        handlerApproveFriendRequest = OnApproveFriendRequest;
+                        if (handlerApproveFriendRequest != null)
                         {
-                            handler005(this, agentID, transactionID, callingCardFolders);
+                            handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
                         }
 
 
@@ -2974,10 +2974,10 @@ namespace OpenSim.Region.ClientStack
                         LLUUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
                         LLUUID exFriendID = tfriendpack.ExBlock.OtherID;
 
-                        handler006 = OnTerminateFriendship;
-                        if (handler006 != null)
+                        handlerTerminateFriendship = OnTerminateFriendship;
+                        if (handlerTerminateFriendship != null)
                         {
-                            handler006(this, listOwnerAgentID, exFriendID);
+                            handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
                         }
 
 
@@ -2985,8 +2985,8 @@ namespace OpenSim.Region.ClientStack
                     case PacketType.RezObject:
                         RezObjectPacket rezPacket = (RezObjectPacket)Pack;
 
-                        handler007 = OnRezObject;
-                        if (handler007 != null)
+                        handlerRezObject = OnRezObject;
+                        if (handlerRezObject != null)
                         {
                             //rezPacket.RezData.BypassRaycast;
                             //rezPacket.RezData.RayEnd;
@@ -2998,7 +2998,7 @@ namespace OpenSim.Region.ClientStack
                             //rezPacket.RezData.FromTaskID;
                             //m_log.Info("[REZData]: " + rezPacket.ToString());
 
-                            handler007(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
+                            handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
                                 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
                                 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
                                 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask,
@@ -3009,10 +3009,10 @@ namespace OpenSim.Region.ClientStack
 
                         break;
                     case PacketType.DeRezObject:
-                        handler008 = OnDeRezObject;
-                        if (handler008 != null)
+                        handlerDeRezObject = OnDeRezObject;
+                        if (handlerDeRezObject != null)
                         {
-                            handler008(Pack, this);
+                            handlerDeRezObject(Pack, this);
                         }
 
                         break;
@@ -3026,10 +3026,10 @@ namespace OpenSim.Region.ClientStack
 
                                 for (int i = 0; i < modify.ParcelData.Length; i++)
                                 {
-                                    handler009 = OnModifyTerrain;
-                                    if (handler009 != null)
+                                    handlerModifyTerrain = OnModifyTerrain;
+                                    if (handlerModifyTerrain != null)
                                     {
-                                        OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds,
+                                        handlerModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds,
                                                         modify.ModifyBlock.BrushSize,
                                                         modify.ModifyBlock.Action, modify.ParcelData[i].North,
                                                         modify.ParcelData[i].West, modify.ParcelData[i].South,
diff --git a/OpenSim/Region/Communications/Local/LocalLoginService.cs b/OpenSim/Region/Communications/Local/LocalLoginService.cs
index 0e9b3d0..d7b3a58 100644
--- a/OpenSim/Region/Communications/Local/LocalLoginService.cs
+++ b/OpenSim/Region/Communications/Local/LocalLoginService.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Communications.Local
 
         public event LoginToRegionEvent OnLoginToRegion;
 
-        private LoginToRegionEvent handler001 = null; // OnLoginToRegion;
+        private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion;
 
         public LocalLoginService(UserManagerBase userManager, string welcomeMess, 
                                  CommunicationsLocal parent, NetworkServersInfo serversInfo, 
@@ -163,10 +163,10 @@ namespace OpenSim.Region.Communications.Local
                 _login.StartPos = new LLVector3(128, 128, 70);
                 _login.CapsPath = capsPath;
 
-                handler001 = OnLoginToRegion;
-                if (handler001 != null)
+                handlerLoginToRegion = OnLoginToRegion;
+                if (handlerLoginToRegion != null)
                 {
-                    handler001(currentRegion, _login);
+                    handlerLoginToRegion(currentRegion, _login);
                 }
             }
             else
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index d21852d..2fce37e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -59,13 +59,13 @@ namespace OpenSim.Region.Communications.OGS1
         public event ChildAgentUpdate OnChildAgentUpdate;
         public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection;
 
-        private InformRegionChild handler001 = null; // OnChildAgent;
-        private ExpectArrival handler002 = null; // OnArrival;
-        private InformRegionPrimGroup handler003 = null; // OnPrimGroupNear;
-        private PrimGroupArrival handler004 = null; // OnPrimGroupArrival;
-        private RegionUp handler005 = null; // OnRegionUp;
-        private ChildAgentUpdate handler006 = null; // OnChildAgentUpdate;
-        private TellRegionToCloseChildConnection handler007 = null; // OnTellRegionToCloseChildConnection;
+        private InformRegionChild handlerChildAgent = null; // OnChildAgent;
+        private ExpectArrival handlerArrival = null; // OnArrival;
+        private InformRegionPrimGroup handlerPrimGroupNear = null; // OnPrimGroupNear;
+        private PrimGroupArrival handlerPrimGroupArrival = null; // OnPrimGroupArrival;
+        private RegionUp handlerRegionUp = null; // OnRegionUp;
+        private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
+        private TellRegionToCloseChildConnection handlerTellRegionToCloseChildConnection = null; // OnTellRegionToCloseChildConnection;
 
 
         static InterRegionSingleton()
@@ -83,70 +83,70 @@ namespace OpenSim.Region.Communications.OGS1
 
         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
         {
-            handler001 = OnChildAgent;
-            if (handler001 != null)
+            handlerChildAgent = OnChildAgent;
+            if (handlerChildAgent != null)
             {
-                return handler001(regionHandle, agentData);
+                return handlerChildAgent(regionHandle, agentData);
             }
             return false;
         }
 
         public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
         {
-            handler005 = OnRegionUp;
-            if (handler005 != null)
+            handlerRegionUp = OnRegionUp;
+            if (handlerRegionUp != null)
             {
-                return handler005(sregion, regionhandle);
+                return handlerRegionUp(sregion, regionhandle);
             }
             return false;
         }
 
         public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentUpdate)
         {
-            handler006 = OnChildAgentUpdate;
-            if (handler006 != null)
+            handlerChildAgentUpdate = OnChildAgentUpdate;
+            if (handlerChildAgentUpdate != null)
             {
-                return handler006(regionHandle, cAgentUpdate);
+                return handlerChildAgentUpdate(regionHandle, cAgentUpdate);
             }
             return false;
         }
 
         public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
-            handler002 = OnArrival;
-            if (handler002 != null)
+            handlerArrival = OnArrival;
+            if (handlerArrival != null)
             {
-                return handler002(regionHandle, agentID, position, isFlying);
+                return handlerArrival(regionHandle, agentID, position, isFlying);
             }
             return false;
         }
 
         public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
         {
-            handler003 = OnPrimGroupNear;
-            if (handler003 != null)
+            handlerPrimGroupNear = OnPrimGroupNear;
+            if (handlerPrimGroupNear != null)
             {
-                return handler003(regionHandle, primID, position, isPhysical);
+                return handlerPrimGroupNear(regionHandle, primID, position, isPhysical);
             }
             return false;
         }
 
         public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
         {
-            handler004 = OnPrimGroupArrival;
-            if (handler004 != null)
+            handlerPrimGroupArrival = OnPrimGroupArrival;
+            if (handlerPrimGroupArrival != null)
             {
-                return handler004(regionHandle, primID, objData);
+                return handlerPrimGroupArrival(regionHandle, primID, objData);
             }
             return false;
         }
 
         public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
         {
-            handler007 = OnTellRegionToCloseChildConnection;
-            if (handler007 != null)
+            handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection;
+            if (handlerTellRegionToCloseChildConnection != null)
             {
-                return handler007(regionHandle, agentID);
+                return handlerTellRegionToCloseChildConnection(regionHandle, agentID);
             }
             return false;
         }
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;