aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs24
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs78
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs8
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs72
-rw-r--r--OpenSim/Region/Communications/Local/LocalLoginService.cs8
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs56
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs64
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs72
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SimStatsReporter.cs8
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
475 public class AssetUploader 475 public class AssetUploader
476 { 476 {
477 public event UpLoadedAsset OnUpLoad; 477 public event UpLoadedAsset OnUpLoad;
478 private UpLoadedAsset handler001 = null; 478 private UpLoadedAsset handlerUpLoad = null;
479 479
480 private string uploaderPath = String.Empty; 480 private string uploaderPath = String.Empty;
481 private LLUUID newAssetID; 481 private LLUUID newAssetID;
@@ -529,10 +529,10 @@ namespace OpenSim.Region.Capabilities
529 { 529 {
530 SaveAssetToFile(m_assetName + ".jp2", data); 530 SaveAssetToFile(m_assetName + ".jp2", data);
531 } 531 }
532 handler001 = OnUpLoad; 532 handlerUpLoad = OnUpLoad;
533 if (handler001 != null) 533 if (handlerUpLoad != null)
534 { 534 {
535 handler001(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType); 535 handlerUpLoad(m_assetName, m_assetDes, newAssetID, inv, parentFolder, data, m_invType, m_assetType);
536 } 536 }
537 537
538 return res; 538 return res;
@@ -569,7 +569,7 @@ namespace OpenSim.Region.Capabilities
569 { 569 {
570 public event UpdateItem OnUpLoad; 570 public event UpdateItem OnUpLoad;
571 571
572 private UpdateItem handler001 = null; 572 private UpdateItem handlerUpdateItem = null;
573 573
574 private string uploaderPath = String.Empty; 574 private string uploaderPath = String.Empty;
575 private LLUUID inventoryItemID; 575 private LLUUID inventoryItemID;
@@ -598,10 +598,10 @@ namespace OpenSim.Region.Capabilities
598 string res = String.Empty; 598 string res = String.Empty;
599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 599 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
600 LLUUID assetID = LLUUID.Zero; 600 LLUUID assetID = LLUUID.Zero;
601 handler001 = OnUpLoad; 601 handlerUpdateItem = OnUpLoad;
602 if (handler001 != null) 602 if (handlerUpdateItem != null)
603 { 603 {
604 assetID = handler001(inv, data); 604 assetID = handlerUpdateItem(inv, data);
605 } 605 }
606 606
607 uploadComplete.new_asset = assetID.ToString(); 607 uploadComplete.new_asset = assetID.ToString();
@@ -651,7 +651,7 @@ namespace OpenSim.Region.Capabilities
651 { 651 {
652 public event UpdateTaskScript OnUpLoad; 652 public event UpdateTaskScript OnUpLoad;
653 653
654 private UpdateTaskScript handler001 = null; 654 private UpdateTaskScript handlerUpdateTaskScript = null;
655 655
656 private string uploaderPath = String.Empty; 656 private string uploaderPath = String.Empty;
657 private LLUUID inventoryItemID; 657 private LLUUID inventoryItemID;
@@ -693,10 +693,10 @@ namespace OpenSim.Region.Capabilities
693 string res = String.Empty; 693 string res = String.Empty;
694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete(); 694 LLSDTaskInventoryUploadComplete uploadComplete = new LLSDTaskInventoryUploadComplete();
695 695
696 handler001 = OnUpLoad; 696 handlerUpdateTaskScript = OnUpLoad;
697 if (handler001 != null) 697 if (handlerUpdateTaskScript != null)
698 { 698 {
699 handler001(inventoryItemID, primID, isScriptRunning, data); 699 handlerUpdateTaskScript(inventoryItemID, primID, isScriptRunning, data);
700 } 700 }
701 701
702 uploadComplete.item_id = inventoryItemID; 702 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
46 public event RegionUp OnRegionUp; 46 public event RegionUp OnRegionUp;
47 public event ChildAgentUpdate OnChildAgentUpdate; 47 public event ChildAgentUpdate OnChildAgentUpdate;
48 48
49 private ExpectUserDelegate handler001 = null; // OnExpectUser 49 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
50 private ExpectPrimDelegate handler002 = null; // OnExpectPrim; 50 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
51 private GenericCall2 handler003 = null; // OnExpectChildAgent; 51 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
52 private AgentCrossing handler004 = null; // OnAvatarCrossingIntoRegion; 52 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
53 private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion; 53 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
54 private UpdateNeighbours handler006 = null; // OnNeighboursUpdate; 54 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
55 private AcknowledgeAgentCross handler007 = null; // OnAcknowledgeAgentCrossed; 55 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
56 private AcknowledgePrimCross handler008 = null; // OnAcknowledgePrimCrossed; 56 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
57 private CloseAgentConnection handler009 = null; // OnCloseAgentConnection; 57 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
58 private RegionUp handlerRegionUp = null; // OnRegionUp; 58 private RegionUp handlerRegionUp = null; // OnRegionUp;
59 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; 59 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
60 60
@@ -68,10 +68,10 @@ namespace OpenSim.Framework
68 /// <returns></returns> 68 /// <returns></returns>
69 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 69 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
70 { 70 {
71 handler001 = OnExpectUser; 71 handlerExpectUser = OnExpectUser;
72 if (handler001 != null) 72 if (handlerExpectUser != null)
73 { 73 {
74 handler001(regionHandle, agent); 74 handlerExpectUser(regionHandle, agent);
75 return true; 75 return true;
76 } 76 }
77 77
@@ -81,10 +81,10 @@ namespace OpenSim.Framework
81 81
82 public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData) 82 public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
83 { 83 {
84 handler002 = OnExpectPrim; 84 handlerExpectPrim = OnExpectPrim;
85 if (handler002 != null) 85 if (handlerExpectPrim != null)
86 { 86 {
87 handler002(regionHandle, primID, objData); 87 handlerExpectPrim(regionHandle, primID, objData);
88 return true; 88 return true;
89 } 89 }
90 return false; 90 return false;
@@ -115,10 +115,10 @@ namespace OpenSim.Framework
115 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, 115 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
116 bool isFlying) 116 bool isFlying)
117 { 117 {
118 handler004 = OnAvatarCrossingIntoRegion; 118 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
119 if (handler004 != null) 119 if (handlerAvatarCrossingIntoRegion != null)
120 { 120 {
121 handler004(regionHandle, agentID, position, isFlying); 121 handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
122 return true; 122 return true;
123 } 123 }
124 return false; 124 return false;
@@ -127,10 +127,10 @@ namespace OpenSim.Framework
127 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, 127 public virtual bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position,
128 bool isPhysical) 128 bool isPhysical)
129 { 129 {
130 handler005 = OnPrimCrossingIntoRegion; 130 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
131 if (handler005 != null) 131 if (handlerPrimCrossingIntoRegion != null)
132 { 132 {
133 handler005(regionHandle, primID, position, isPhysical); 133 handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical);
134 return true; 134 return true;
135 } 135 }
136 return false; 136 return false;
@@ -138,10 +138,10 @@ namespace OpenSim.Framework
138 138
139 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID) 139 public virtual bool TriggerAcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentID)
140 { 140 {
141 handler007 = OnAcknowledgeAgentCrossed; 141 handlerAcknowledgeAgentCrossed = OnAcknowledgeAgentCrossed;
142 if (handler007 != null) 142 if (handlerAcknowledgeAgentCrossed != null)
143 { 143 {
144 handler007(regionHandle, agentID); 144 handlerAcknowledgeAgentCrossed(regionHandle, agentID);
145 return true; 145 return true;
146 } 146 }
147 return false; 147 return false;
@@ -149,10 +149,10 @@ namespace OpenSim.Framework
149 149
150 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID) 150 public virtual bool TriggerAcknowledgePrimCrossed(ulong regionHandle, LLUUID primID)
151 { 151 {
152 handler008 = OnAcknowledgePrimCrossed; 152 handlerAcknowledgePrimCrossed = OnAcknowledgePrimCrossed;
153 if (handler008 != null) 153 if (handlerAcknowledgePrimCrossed != null)
154 { 154 {
155 handler008(regionHandle, primID); 155 handlerAcknowledgePrimCrossed(regionHandle, primID);
156 return true; 156 return true;
157 } 157 }
158 return false; 158 return false;
@@ -160,10 +160,10 @@ namespace OpenSim.Framework
160 160
161 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID) 161 public virtual bool TriggerCloseAgentConnection(ulong regionHandle, LLUUID agentID)
162 { 162 {
163 handler009 = OnCloseAgentConnection; 163 handlerCloseAgentConnection = OnCloseAgentConnection;
164 if (handler009 != null) 164 if (handlerCloseAgentConnection != null)
165 { 165 {
166 handler009(regionHandle, agentID); 166 handlerCloseAgentConnection(regionHandle, agentID);
167 return true; 167 return true;
168 168
169 } 169 }
@@ -177,10 +177,10 @@ namespace OpenSim.Framework
177 /// <returns></returns> 177 /// <returns></returns>
178 public virtual bool TriggerExpectChildAgent() 178 public virtual bool TriggerExpectChildAgent()
179 { 179 {
180 handler003 = OnExpectChildAgent; 180 handlerExpectChildAgent = OnExpectChildAgent;
181 if (handler003 != null) 181 if (handlerExpectChildAgent != null)
182 { 182 {
183 handler003(); 183 handlerExpectChildAgent();
184 return true; 184 return true;
185 } 185 }
186 186
@@ -195,10 +195,10 @@ namespace OpenSim.Framework
195 /// <returns></returns> 195 /// <returns></returns>
196 public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours) 196 public virtual bool TriggerOnNeighboursUpdate(List<RegionInfo> neighbours)
197 { 197 {
198 handler006 = OnNeighboursUpdate; 198 handlerNeighboursUpdate = OnNeighboursUpdate;
199 if (handler006 != null) 199 if (handlerNeighboursUpdate != null)
200 { 200 {
201 handler006(neighbours); 201 handlerNeighboursUpdate(neighbours);
202 return true; 202 return true;
203 } 203 }
204 204
@@ -207,9 +207,9 @@ namespace OpenSim.Framework
207 207
208 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 208 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
209 { 209 {
210 handler009 = OnCloseAgentConnection; 210 handlerCloseAgentConnection = OnCloseAgentConnection;
211 if (handler009 != null) 211 if (handlerCloseAgentConnection != null)
212 return handler009(regionHandle, agentID); 212 return handlerCloseAgentConnection(regionHandle, agentID);
213 213
214 return false; 214 return false;
215 } 215 }
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
54 54
55 public event UserLoggedInAtLocation OnUserLoggedInAtLocation; 55 public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
56 56
57 private UserLoggedInAtLocation handler001 = null; 57 private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null;
58 58
59 public UserConfig m_config; 59 public UserConfig m_config;
60 60
@@ -147,11 +147,11 @@ namespace OpenSim.Grid.UserServer
147 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 147 "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
148 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString); 148 SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
149 } 149 }
150 handler001 = OnUserLoggedInAtLocation; 150 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
151 if (handler001 != null) 151 if (handlerUserLoggedInAtLocation != null)
152 { 152 {
153 m_log.Info("[LOGIN]: Letting other objects know about login"); 153 m_log.Info("[LOGIN]: Letting other objects know about login");
154 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, 154 handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion,
155 theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z, 155 theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X,theUser.currentAgent.currentPos.Y,theUser.currentAgent.currentPos.Z,
156 theUser.username,theUser.surname); 156 theUser.username,theUser.surname);
157 } 157 }
@@ -226,11 +226,11 @@ namespace OpenSim.Grid.UserServer
226 // Send 226 // Send
227 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); 227 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
228 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); 228 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
229 handler001 = OnUserLoggedInAtLocation; 229 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
230 if (handler001 != null) 230 if (handlerUserLoggedInAtLocation != null)
231 { 231 {
232 m_log.Info("[LOGIN]: Letting other objects know about login"); 232 m_log.Info("[LOGIN]: Letting other objects know about login");
233 handler001(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion, 233 handlerUserLoggedInAtLocation(theUser.UUID, theUser.currentAgent.sessionID, theUser.currentAgent.currentRegion,
234 theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z, 234 theUser.currentAgent.currentHandle, theUser.currentAgent.currentPos.X, theUser.currentAgent.currentPos.Y, theUser.currentAgent.currentPos.Z,
235 theUser.username, theUser.surname); 235 theUser.username, theUser.surname);
236 } 236 }
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
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
45 public event logOffUser OnLogOffUser; 45 public event logOffUser OnLogOffUser;
46 private logOffUser handler001 = null; 46 private logOffUser handlerLogOffUser = null;
47 /// <summary> 47 /// <summary>
48 /// Deletes an active agent session 48 /// Deletes an active agent session
49 /// </summary> 49 /// </summary>
@@ -331,9 +331,9 @@ namespace OpenSim.Grid.UserServer
331 float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]); 331 float posy = (float)Convert.ToDecimal((string)requestData["region_pos_y"]);
332 float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]); 332 float posz = (float)Convert.ToDecimal((string)requestData["region_pos_z"]);
333 333
334 handler001 = OnLogOffUser; 334 handlerLogOffUser = OnLogOffUser;
335 if (handler001 != null) 335 if (handlerLogOffUser != null)
336 handler001(userUUID); 336 handlerLogOffUser(userUUID);
337 337
338 LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz); 338 LogOffUser(userUUID, RegionID, regionhandle, posx, posy, posz);
339 } 339 }
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
122 /* Instantiated Designated Event Delegates */ 122 /* Instantiated Designated Event Delegates */
123 //- used so we don't create new objects for each incoming packet and then toss it out later */ 123 //- used so we don't create new objects for each incoming packet and then toss it out later */
124 124
125 private RequestAvatarProperties handler001 = null; //OnRequestAvatarProperties; 125 private RequestAvatarProperties handlerRequestAvatarProperties = null; //OnRequestAvatarProperties;
126 private ChatFromViewer handler002 = null; //OnChatFromViewer; 126 private ChatFromViewer handlerChatFromViewer = null; //OnChatFromViewer;
127 private ChatFromViewer handler003 = null; //OnChatFromViewer; 127 private ChatFromViewer handlerChatFromViewer2 = null; //OnChatFromViewer;
128 private ImprovedInstantMessage handler004 = null; //OnInstantMessage; 128 private ImprovedInstantMessage handlerInstantMessage = null; //OnInstantMessage;
129 private FriendActionDelegate handler005 = null; //OnApproveFriendRequest; 129 private FriendActionDelegate handlerApproveFriendRequest = null; //OnApproveFriendRequest;
130 private FriendshipTermination handler006 = null; //OnTerminateFriendship; 130 private FriendshipTermination handlerTerminateFriendship = null; //OnTerminateFriendship;
131 private RezObject handler007 = null; //OnRezObject; 131 private RezObject handlerRezObject = null; //OnRezObject;
132 private GenericCall4 handler008 = null; //OnDeRezObject; 132 private GenericCall4 handlerDeRezObject = null; //OnDeRezObject;
133 private ModifyTerrain handler009 = null; 133 private ModifyTerrain handlerModifyTerrain = null;
134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply; 134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables; 135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData; 136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
@@ -2866,10 +2866,10 @@ namespace OpenSim.Region.ClientStack
2866 case PacketType.AvatarPropertiesRequest: 2866 case PacketType.AvatarPropertiesRequest:
2867 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack; 2867 AvatarPropertiesRequestPacket avatarProperties = (AvatarPropertiesRequestPacket)Pack;
2868 2868
2869 handler001 = OnRequestAvatarProperties; 2869 handlerRequestAvatarProperties = OnRequestAvatarProperties;
2870 if (handler001 != null) 2870 if (handlerRequestAvatarProperties != null)
2871 { 2871 {
2872 handler001(this, avatarProperties.AgentData.AvatarID); 2872 handlerRequestAvatarProperties(this, avatarProperties.AgentData.AvatarID);
2873 } 2873 }
2874 2874
2875 2875
@@ -2897,9 +2897,9 @@ namespace OpenSim.Region.ClientStack
2897 args.Scene = Scene; 2897 args.Scene = Scene;
2898 args.Sender = this; 2898 args.Sender = this;
2899 2899
2900 handler002 = OnChatFromViewer; 2900 handlerChatFromViewer = OnChatFromViewer;
2901 if (handler002 != null) 2901 if (handlerChatFromViewer != null)
2902 handler002(this, args); 2902 handlerChatFromViewer(this, args);
2903 } 2903 }
2904 2904
2905 2905
@@ -2919,9 +2919,9 @@ namespace OpenSim.Region.ClientStack
2919 args.Position = new LLVector3(); 2919 args.Position = new LLVector3();
2920 args.Scene = Scene; 2920 args.Scene = Scene;
2921 args.Sender = this; 2921 args.Sender = this;
2922 handler003 = OnChatFromViewer; 2922 handlerChatFromViewer2 = OnChatFromViewer;
2923 if (handler003 != null) 2923 if (handlerChatFromViewer2 != null)
2924 handler003(this, args); 2924 handlerChatFromViewer2(this, args);
2925 } 2925 }
2926 2926
2927 break; 2927 break;
@@ -2929,11 +2929,11 @@ namespace OpenSim.Region.ClientStack
2929 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack; 2929 ImprovedInstantMessagePacket msgpack = (ImprovedInstantMessagePacket)Pack;
2930 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName); 2930 string IMfromName = Util.FieldToString(msgpack.MessageBlock.FromAgentName);
2931 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message); 2931 string IMmessage = Helpers.FieldToUTF8String(msgpack.MessageBlock.Message);
2932 handler004 = OnInstantMessage; 2932 handlerInstantMessage = OnInstantMessage;
2933 2933
2934 if (handler004 != null) 2934 if (handlerInstantMessage != null)
2935 { 2935 {
2936 handler004(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID, 2936 handlerInstantMessage(this, msgpack.AgentData.AgentID, msgpack.AgentData.SessionID,
2937 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID, 2937 msgpack.MessageBlock.ToAgentID, msgpack.MessageBlock.ID,
2938 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage, 2938 msgpack.MessageBlock.Timestamp, IMfromName, IMmessage,
2939 msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup, 2939 msgpack.MessageBlock.Dialog, msgpack.MessageBlock.FromGroup,
@@ -2959,10 +2959,10 @@ namespace OpenSim.Region.ClientStack
2959 callingCardFolders.Add(afriendpack.FolderData[fi].FolderID); 2959 callingCardFolders.Add(afriendpack.FolderData[fi].FolderID);
2960 } 2960 }
2961 2961
2962 handler005 = OnApproveFriendRequest; 2962 handlerApproveFriendRequest = OnApproveFriendRequest;
2963 if (handler005 != null) 2963 if (handlerApproveFriendRequest != null)
2964 { 2964 {
2965 handler005(this, agentID, transactionID, callingCardFolders); 2965 handlerApproveFriendRequest(this, agentID, transactionID, callingCardFolders);
2966 } 2966 }
2967 2967
2968 2968
@@ -2974,10 +2974,10 @@ namespace OpenSim.Region.ClientStack
2974 LLUUID listOwnerAgentID = tfriendpack.AgentData.AgentID; 2974 LLUUID listOwnerAgentID = tfriendpack.AgentData.AgentID;
2975 LLUUID exFriendID = tfriendpack.ExBlock.OtherID; 2975 LLUUID exFriendID = tfriendpack.ExBlock.OtherID;
2976 2976
2977 handler006 = OnTerminateFriendship; 2977 handlerTerminateFriendship = OnTerminateFriendship;
2978 if (handler006 != null) 2978 if (handlerTerminateFriendship != null)
2979 { 2979 {
2980 handler006(this, listOwnerAgentID, exFriendID); 2980 handlerTerminateFriendship(this, listOwnerAgentID, exFriendID);
2981 } 2981 }
2982 2982
2983 2983
@@ -2985,8 +2985,8 @@ namespace OpenSim.Region.ClientStack
2985 case PacketType.RezObject: 2985 case PacketType.RezObject:
2986 RezObjectPacket rezPacket = (RezObjectPacket)Pack; 2986 RezObjectPacket rezPacket = (RezObjectPacket)Pack;
2987 2987
2988 handler007 = OnRezObject; 2988 handlerRezObject = OnRezObject;
2989 if (handler007 != null) 2989 if (handlerRezObject != null)
2990 { 2990 {
2991 //rezPacket.RezData.BypassRaycast; 2991 //rezPacket.RezData.BypassRaycast;
2992 //rezPacket.RezData.RayEnd; 2992 //rezPacket.RezData.RayEnd;
@@ -2998,7 +2998,7 @@ namespace OpenSim.Region.ClientStack
2998 //rezPacket.RezData.FromTaskID; 2998 //rezPacket.RezData.FromTaskID;
2999 //m_log.Info("[REZData]: " + rezPacket.ToString()); 2999 //m_log.Info("[REZData]: " + rezPacket.ToString());
3000 3000
3001 handler007(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd, 3001 handlerRezObject(this, rezPacket.InventoryData.ItemID, rezPacket.RezData.RayEnd,
3002 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID, 3002 rezPacket.RezData.RayStart, rezPacket.RezData.RayTargetID,
3003 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection, 3003 rezPacket.RezData.BypassRaycast, rezPacket.RezData.RayEndIsIntersection,
3004 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask, 3004 rezPacket.RezData.EveryoneMask, rezPacket.RezData.GroupMask,
@@ -3009,10 +3009,10 @@ namespace OpenSim.Region.ClientStack
3009 3009
3010 break; 3010 break;
3011 case PacketType.DeRezObject: 3011 case PacketType.DeRezObject:
3012 handler008 = OnDeRezObject; 3012 handlerDeRezObject = OnDeRezObject;
3013 if (handler008 != null) 3013 if (handlerDeRezObject != null)
3014 { 3014 {
3015 handler008(Pack, this); 3015 handlerDeRezObject(Pack, this);
3016 } 3016 }
3017 3017
3018 break; 3018 break;
@@ -3026,10 +3026,10 @@ namespace OpenSim.Region.ClientStack
3026 3026
3027 for (int i = 0; i < modify.ParcelData.Length; i++) 3027 for (int i = 0; i < modify.ParcelData.Length; i++)
3028 { 3028 {
3029 handler009 = OnModifyTerrain; 3029 handlerModifyTerrain = OnModifyTerrain;
3030 if (handler009 != null) 3030 if (handlerModifyTerrain != null)
3031 { 3031 {
3032 OnModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds, 3032 handlerModifyTerrain(modify.ModifyBlock.Height, modify.ModifyBlock.Seconds,
3033 modify.ModifyBlock.BrushSize, 3033 modify.ModifyBlock.BrushSize,
3034 modify.ModifyBlock.Action, modify.ParcelData[i].North, 3034 modify.ModifyBlock.Action, modify.ParcelData[i].North,
3035 modify.ParcelData[i].West, modify.ParcelData[i].South, 3035 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
55 55
56 public event LoginToRegionEvent OnLoginToRegion; 56 public event LoginToRegionEvent OnLoginToRegion;
57 57
58 private LoginToRegionEvent handler001 = null; // OnLoginToRegion; 58 private LoginToRegionEvent handlerLoginToRegion = null; // OnLoginToRegion;
59 59
60 public LocalLoginService(UserManagerBase userManager, string welcomeMess, 60 public LocalLoginService(UserManagerBase userManager, string welcomeMess,
61 CommunicationsLocal parent, NetworkServersInfo serversInfo, 61 CommunicationsLocal parent, NetworkServersInfo serversInfo,
@@ -163,10 +163,10 @@ namespace OpenSim.Region.Communications.Local
163 _login.StartPos = new LLVector3(128, 128, 70); 163 _login.StartPos = new LLVector3(128, 128, 70);
164 _login.CapsPath = capsPath; 164 _login.CapsPath = capsPath;
165 165
166 handler001 = OnLoginToRegion; 166 handlerLoginToRegion = OnLoginToRegion;
167 if (handler001 != null) 167 if (handlerLoginToRegion != null)
168 { 168 {
169 handler001(currentRegion, _login); 169 handlerLoginToRegion(currentRegion, _login);
170 } 170 }
171 } 171 }
172 else 172 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
59 public event ChildAgentUpdate OnChildAgentUpdate; 59 public event ChildAgentUpdate OnChildAgentUpdate;
60 public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection; 60 public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection;
61 61
62 private InformRegionChild handler001 = null; // OnChildAgent; 62 private InformRegionChild handlerChildAgent = null; // OnChildAgent;
63 private ExpectArrival handler002 = null; // OnArrival; 63 private ExpectArrival handlerArrival = null; // OnArrival;
64 private InformRegionPrimGroup handler003 = null; // OnPrimGroupNear; 64 private InformRegionPrimGroup handlerPrimGroupNear = null; // OnPrimGroupNear;
65 private PrimGroupArrival handler004 = null; // OnPrimGroupArrival; 65 private PrimGroupArrival handlerPrimGroupArrival = null; // OnPrimGroupArrival;
66 private RegionUp handler005 = null; // OnRegionUp; 66 private RegionUp handlerRegionUp = null; // OnRegionUp;
67 private ChildAgentUpdate handler006 = null; // OnChildAgentUpdate; 67 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
68 private TellRegionToCloseChildConnection handler007 = null; // OnTellRegionToCloseChildConnection; 68 private TellRegionToCloseChildConnection handlerTellRegionToCloseChildConnection = null; // OnTellRegionToCloseChildConnection;
69 69
70 70
71 static InterRegionSingleton() 71 static InterRegionSingleton()
@@ -83,70 +83,70 @@ namespace OpenSim.Region.Communications.OGS1
83 83
84 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 84 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
85 { 85 {
86 handler001 = OnChildAgent; 86 handlerChildAgent = OnChildAgent;
87 if (handler001 != null) 87 if (handlerChildAgent != null)
88 { 88 {
89 return handler001(regionHandle, agentData); 89 return handlerChildAgent(regionHandle, agentData);
90 } 90 }
91 return false; 91 return false;
92 } 92 }
93 93
94 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) 94 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
95 { 95 {
96 handler005 = OnRegionUp; 96 handlerRegionUp = OnRegionUp;
97 if (handler005 != null) 97 if (handlerRegionUp != null)
98 { 98 {
99 return handler005(sregion, regionhandle); 99 return handlerRegionUp(sregion, regionhandle);
100 } 100 }
101 return false; 101 return false;
102 } 102 }
103 103
104 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentUpdate) 104 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentUpdate)
105 { 105 {
106 handler006 = OnChildAgentUpdate; 106 handlerChildAgentUpdate = OnChildAgentUpdate;
107 if (handler006 != null) 107 if (handlerChildAgentUpdate != null)
108 { 108 {
109 return handler006(regionHandle, cAgentUpdate); 109 return handlerChildAgentUpdate(regionHandle, cAgentUpdate);
110 } 110 }
111 return false; 111 return false;
112 } 112 }
113 113
114 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 114 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
115 { 115 {
116 handler002 = OnArrival; 116 handlerArrival = OnArrival;
117 if (handler002 != null) 117 if (handlerArrival != null)
118 { 118 {
119 return handler002(regionHandle, agentID, position, isFlying); 119 return handlerArrival(regionHandle, agentID, position, isFlying);
120 } 120 }
121 return false; 121 return false;
122 } 122 }
123 123
124 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 124 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
125 { 125 {
126 handler003 = OnPrimGroupNear; 126 handlerPrimGroupNear = OnPrimGroupNear;
127 if (handler003 != null) 127 if (handlerPrimGroupNear != null)
128 { 128 {
129 return handler003(regionHandle, primID, position, isPhysical); 129 return handlerPrimGroupNear(regionHandle, primID, position, isPhysical);
130 } 130 }
131 return false; 131 return false;
132 } 132 }
133 133
134 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 134 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
135 { 135 {
136 handler004 = OnPrimGroupArrival; 136 handlerPrimGroupArrival = OnPrimGroupArrival;
137 if (handler004 != null) 137 if (handlerPrimGroupArrival != null)
138 { 138 {
139 return handler004(regionHandle, primID, objData); 139 return handlerPrimGroupArrival(regionHandle, primID, objData);
140 } 140 }
141 return false; 141 return false;
142 } 142 }
143 143
144 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 144 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
145 { 145 {
146 handler007 = OnTellRegionToCloseChildConnection; 146 handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection;
147 if (handler007 != null) 147 if (handlerTellRegionToCloseChildConnection != null)
148 { 148 {
149 return handler007(regionHandle, agentID); 149 return handlerTellRegionToCloseChildConnection(regionHandle, agentID);
150 } 150 }
151 return false; 151 return false;
152 } 152 }
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
47 #region Events 47 #region Events
48 48
49 public event PhysicsCrash UnRecoverableError; 49 public event PhysicsCrash UnRecoverableError;
50 private PhysicsCrash handler001 = null; 50 private PhysicsCrash handlerPhysicsCrash = null;
51 51
52 #endregion 52 #endregion
53 53
@@ -716,10 +716,10 @@ namespace OpenSim.Region.Environment.Scenes
716 716
717 public void physicsBasedCrash() 717 public void physicsBasedCrash()
718 { 718 {
719 handler001 = UnRecoverableError; 719 handlerPhysicsCrash = UnRecoverableError;
720 if (handler001 != null) 720 if (handlerPhysicsCrash != null)
721 { 721 {
722 handler001(); 722 handlerPhysicsCrash();
723 } 723 }
724 } 724 }
725 725
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
160 public virtual void Restart(int seconds) 160 public virtual void Restart(int seconds)
161 { 161 {
162 m_log.Error("[REGION]: passing Restart Message up the namespace"); 162 m_log.Error("[REGION]: passing Restart Message up the namespace");
163 restart handler001 = OnRestart; 163 restart handlerPhysicsCrash = OnRestart;
164 if (handler001 != null) 164 if (handlerPhysicsCrash != null)
165 handler001(RegionInfo); 165 handlerPhysicsCrash(RegionInfo);
166 } 166 }
167 167
168 public virtual bool PresenceChildStatus(LLUUID avatarID) 168 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
58 public event ChildAgentUpdate OnChildAgentUpdate; 58 public event ChildAgentUpdate OnChildAgentUpdate;
59 public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; 59 public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar;
60 60
61 private AgentCrossing handler001 = null; // OnAvatarCrossingIntoRegion; 61 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
62 private ExpectUserDelegate handler002 = null; // OnExpectUser; 62 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser;
63 private ExpectPrimDelegate handler003 = null; // OnExpectPrim; 63 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
64 private CloseAgentConnection handler004 = null; // OnCloseAgentConnection; 64 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
65 private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion; 65 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
66 private RegionUp handler006 = null; // OnRegionUp; 66 private RegionUp handlerRegionUp = null; // OnRegionUp;
67 private ChildAgentUpdate handler007 = null; // OnChildAgentUpdate; 67 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
68 private RemoveKnownRegionsFromAvatarList handler008 = null; // OnRemoveKnownRegionFromAvatar; 68 private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar;
69 69
70 public KillObjectDelegate KillObject; 70 public KillObjectDelegate KillObject;
71 public string _debugRegionName = String.Empty; 71 public string _debugRegionName = String.Empty;
@@ -132,30 +132,30 @@ namespace OpenSim.Region.Environment.Scenes
132 /// 132 ///
133 protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent) 133 protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent)
134 { 134 {
135 handler002 = OnExpectUser; 135 handlerExpectUser = OnExpectUser;
136 if (handler002 != null) 136 if (handlerExpectUser != null)
137 { 137 {
138 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname); 138 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname);
139 handler002(regionHandle, agent); 139 handlerExpectUser(regionHandle, agent);
140 } 140 }
141 } 141 }
142 142
143 protected bool newRegionUp(RegionInfo region) 143 protected bool newRegionUp(RegionInfo region)
144 { 144 {
145 handler006 = OnRegionUp; 145 handlerRegionUp = OnRegionUp;
146 if (handler006 != null) 146 if (handlerRegionUp != null)
147 { 147 {
148 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName); 148 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName);
149 handler006(region); 149 handlerRegionUp(region);
150 } 150 }
151 return true; 151 return true;
152 } 152 }
153 153
154 protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) 154 protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData)
155 { 155 {
156 handler007 = OnChildAgentUpdate; 156 handlerChildAgentUpdate = OnChildAgentUpdate;
157 if (handler007 != null) 157 if (handlerChildAgentUpdate != null)
158 handler007(regionHandle, cAgentData); 158 handlerChildAgentUpdate(regionHandle, cAgentData);
159 159
160 160
161 return true; 161 return true;
@@ -163,39 +163,39 @@ namespace OpenSim.Region.Environment.Scenes
163 163
164 protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 164 protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
165 { 165 {
166 handler001 = OnAvatarCrossingIntoRegion; 166 handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion;
167 if (handler001 != null) 167 if (handlerAvatarCrossingIntoRegion != null)
168 { 168 {
169 handler001(regionHandle, agentID, position, isFlying); 169 handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying);
170 } 170 }
171 } 171 }
172 172
173 protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData) 173 protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData)
174 { 174 {
175 handler003 = OnExpectPrim; 175 handlerExpectPrim = OnExpectPrim;
176 if (handler003 != null) 176 if (handlerExpectPrim != null)
177 { 177 {
178 handler003(regionHandle, primID, objXMLData); 178 handlerExpectPrim(regionHandle, primID, objXMLData);
179 } 179 }
180 180
181 } 181 }
182 182
183 protected void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 183 protected void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
184 { 184 {
185 handler005 = OnPrimCrossingIntoRegion; 185 handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion;
186 if (handler005 != null) 186 if (handlerPrimCrossingIntoRegion != null)
187 { 187 {
188 handler005(regionHandle, primID, position, isPhysical); 188 handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical);
189 } 189 }
190 } 190 }
191 191
192 protected bool CloseConnection(ulong regionHandle, LLUUID agentID) 192 protected bool CloseConnection(ulong regionHandle, LLUUID agentID)
193 { 193 {
194 m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString()); 194 m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString());
195 handler004 = OnCloseAgentConnection; 195 handlerCloseAgentConnection = OnCloseAgentConnection;
196 if (handler004 != null) 196 if (handlerCloseAgentConnection != null)
197 { 197 {
198 return handler004(regionHandle, agentID); 198 return handlerCloseAgentConnection(regionHandle, agentID);
199 } 199 }
200 return false; 200 return false;
201 } 201 }
@@ -437,10 +437,10 @@ namespace OpenSim.Region.Environment.Scenes
437 // We remove the list of known regions from the agent's known region list through an event 437 // We remove the list of known regions from the agent's known region list through an event
438 // to scene, because, if an agent logged of, it's likely that there will be no scene presence 438 // to scene, because, if an agent logged of, it's likely that there will be no scene presence
439 // by the time we get to this part of the method. 439 // by the time we get to this part of the method.
440 handler008 = OnRemoveKnownRegionFromAvatar; 440 handlerRemoveKnownRegionFromAvatar = OnRemoveKnownRegionFromAvatar;
441 if (handler008 != null) 441 if (handlerRemoveKnownRegionFromAvatar != null)
442 { 442 {
443 handler008(agentID, regionlst); 443 handlerRemoveKnownRegionFromAvatar(agentID, regionlst);
444 } 444 }
445 } 445 }
446 446
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
164 164
165 /* Designated Event Deletage Instances */ 165 /* Designated Event Deletage Instances */
166 166
167 private ScriptChangedEvent handler001 = null; //OnScriptChangedEvent; 167 private ScriptChangedEvent handlerScriptChangedEvent = null; //OnScriptChangedEvent;
168 private ClientMovement handler002 = null; //OnClientMovement; 168 private ClientMovement handlerClientMovement = null; //OnClientMovement;
169 private OnPermissionErrorDelegate handler003 = null; //OnPermissionError; 169 private OnPermissionErrorDelegate handlerPermissionError = null; //OnPermissionError;
170 private OnPluginConsoleDelegate handler004 = null; //OnPluginConsole; 170 private OnPluginConsoleDelegate handlerPluginConsole = null; //OnPluginConsole;
171 private OnFrameDelegate handler005 = null; //OnFrame; 171 private OnFrameDelegate handlerFrame = null; //OnFrame;
172 private OnNewClientDelegate handler006 = null; //OnNewClient; 172 private OnNewClientDelegate handlerNewClient = null; //OnNewClient;
173 private OnNewPresenceDelegate handler007 = null; //OnNewPresence; 173 private OnNewPresenceDelegate handlerNewPresence = null; //OnNewPresence;
174 private OnRemovePresenceDelegate handler008 = null; //OnRemovePresence; 174 private OnRemovePresenceDelegate handlerRemovePresence = null; //OnRemovePresence;
175 private OnBackupDelegate handler009 = null; //OnBackup; 175 private OnBackupDelegate handlerBackup = null; //OnBackup;
176 private OnParcelPrimCountUpdateDelegate handlerParcelPrimCountUpdate = null; //OnParcelPrimCountUpdate; 176 private OnParcelPrimCountUpdateDelegate handlerParcelPrimCountUpdate = null; //OnParcelPrimCountUpdate;
177 private MoneyTransferEvent handlerMoneyTransfer = null; //OnMoneyTransfer; 177 private MoneyTransferEvent handlerMoneyTransfer = null; //OnMoneyTransfer;
178 private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd; 178 private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd;
@@ -192,70 +192,70 @@ namespace OpenSim.Region.Environment.Scenes
192 192
193 public void TriggerOnScriptChangedEvent(uint localID, uint change) 193 public void TriggerOnScriptChangedEvent(uint localID, uint change)
194 { 194 {
195 handler001 = OnScriptChangedEvent; 195 handlerScriptChangedEvent = OnScriptChangedEvent;
196 if (handler001 != null) 196 if (handlerScriptChangedEvent != null)
197 handler001(localID, change); 197 handlerScriptChangedEvent(localID, change);
198 } 198 }
199 199
200 public void TriggerOnClientMovement(ScenePresence avatar) 200 public void TriggerOnClientMovement(ScenePresence avatar)
201 { 201 {
202 handler002 = OnClientMovement; 202 handlerClientMovement = OnClientMovement;
203 if (handler002 != null) 203 if (handlerClientMovement != null)
204 handler002(avatar); 204 handlerClientMovement(avatar);
205 } 205 }
206 206
207 public void TriggerPermissionError(LLUUID user, string reason) 207 public void TriggerPermissionError(LLUUID user, string reason)
208 { 208 {
209 handler003 = OnPermissionError; 209 handlerPermissionError = OnPermissionError;
210 if (handler003 != null) 210 if (handlerPermissionError != null)
211 handler003(user, reason); 211 handlerPermissionError(user, reason);
212 } 212 }
213 213
214 public void TriggerOnPluginConsole(string[] args) 214 public void TriggerOnPluginConsole(string[] args)
215 { 215 {
216 handler004 = OnPluginConsole; 216 handlerPluginConsole = OnPluginConsole;
217 if (handler004 != null) 217 if (handlerPluginConsole != null)
218 handler004(args); 218 handlerPluginConsole(args);
219 } 219 }
220 220
221 public void TriggerOnFrame() 221 public void TriggerOnFrame()
222 { 222 {
223 handler005 = OnFrame; 223 handlerFrame = OnFrame;
224 if (handler005 != null) 224 if (handlerFrame != null)
225 { 225 {
226 handler005(); 226 handlerFrame();
227 } 227 }
228 } 228 }
229 229
230 public void TriggerOnNewClient(IClientAPI client) 230 public void TriggerOnNewClient(IClientAPI client)
231 { 231 {
232 handler006 = OnNewClient; 232 handlerNewClient = OnNewClient;
233 if (handler006 != null) 233 if (handlerNewClient != null)
234 handler006(client); 234 handlerNewClient(client);
235 } 235 }
236 236
237 public void TriggerOnNewPresence(ScenePresence presence) 237 public void TriggerOnNewPresence(ScenePresence presence)
238 { 238 {
239 handler007 = OnNewPresence; 239 handlerNewPresence = OnNewPresence;
240 if (handler007 != null) 240 if (handlerNewPresence != null)
241 handler007(presence); 241 handlerNewPresence(presence);
242 } 242 }
243 243
244 public void TriggerOnRemovePresence(LLUUID agentId) 244 public void TriggerOnRemovePresence(LLUUID agentId)
245 { 245 {
246 handler008 = OnRemovePresence; 246 handlerRemovePresence = OnRemovePresence;
247 if (handler008 != null) 247 if (handlerRemovePresence != null)
248 { 248 {
249 handler008(agentId); 249 handlerRemovePresence(agentId);
250 } 250 }
251 } 251 }
252 252
253 public void TriggerOnBackup(IRegionDataStore dstore) 253 public void TriggerOnBackup(IRegionDataStore dstore)
254 { 254 {
255 handler009 = OnBackup; 255 handlerBackup = OnBackup;
256 if (handler009 != null) 256 if (handlerBackup != null)
257 { 257 {
258 handler009(dstore); 258 handlerBackup(dstore);
259 } 259 }
260 } 260 }
261 261
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
54 protected ulong m_regionHandle; 54 protected ulong m_regionHandle;
55 55
56 public event PrimCountTaintedDelegate OnPrimCountTainted; 56 public event PrimCountTaintedDelegate OnPrimCountTainted;
57 private PrimCountTaintedDelegate handler001 = null; 57 private PrimCountTaintedDelegate handlerPrimCountTainted = null;
58 58
59 /// <summary> 59 /// <summary>
60 /// Signal whether the non-inventory attributes of any prims in the group have changed 60 /// Signal whether the non-inventory attributes of any prims in the group have changed
@@ -1534,10 +1534,10 @@ namespace OpenSim.Region.Environment.Scenes
1534 /// </summary> 1534 /// </summary>
1535 public void TriggerTainted() 1535 public void TriggerTainted()
1536 { 1536 {
1537 handler001 = OnPrimCountTainted; 1537 handlerPrimCountTainted = OnPrimCountTainted;
1538 if (handler001 != null) 1538 if (handlerPrimCountTainted != null)
1539 { 1539 {
1540 handler001(); 1540 handlerPrimCountTainted();
1541 } 1541 }
1542 } 1542 }
1543 1543
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
116 private readonly List<ulong> m_knownChildRegions = new List<ulong>(); 116 private readonly List<ulong> m_knownChildRegions = new List<ulong>();
117 //neighbouring regions we have enabled a child agent in 117 //neighbouring regions we have enabled a child agent in
118 118
119 private SignificantClientMovement handler001 = null; //OnSignificantClientMovement; 119 private SignificantClientMovement handlerSignificantClientMovement = null; //OnSignificantClientMovement;
120 120
121 121
122 /// <summary> 122 /// <summary>
@@ -1484,10 +1484,10 @@ namespace OpenSim.Region.Environment.Scenes
1484 if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5) 1484 if (Util.GetDistanceTo(AbsolutePosition, posLastSignificantMove) > 0.5)
1485 { 1485 {
1486 posLastSignificantMove = AbsolutePosition; 1486 posLastSignificantMove = AbsolutePosition;
1487 handler001 = OnSignificantClientMovement; 1487 handlerSignificantClientMovement = OnSignificantClientMovement;
1488 if (handler001 != null) 1488 if (handlerSignificantClientMovement != null)
1489 { 1489 {
1490 handler001(m_controllingClient); 1490 handlerSignificantClientMovement(m_controllingClient);
1491 m_scene.NotifyMyCoarseLocationChange(); 1491 m_scene.NotifyMyCoarseLocationChange();
1492 } 1492 }
1493 } 1493 }
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
39 39
40 public event SendStatResult OnSendStatsResult; 40 public event SendStatResult OnSendStatsResult;
41 41
42 private SendStatResult handler001 = null; 42 private SendStatResult handlerSendStatResult = null;
43 43
44 private enum Stats : uint 44 private enum Stats : uint
45 { 45 {
@@ -247,10 +247,10 @@ namespace OpenSim.Region.Environment.Scenes
247 247
248 statpack.Stat = sb; 248 statpack.Stat = sb;
249 249
250 handler001 = OnSendStatsResult; 250 handlerSendStatResult = OnSendStatsResult;
251 if (handler001 != null) 251 if (handlerSendStatResult != null)
252 { 252 {
253 handler001(statpack); 253 handlerSendStatResult(statpack);
254 } 254 }
255 resetvalues(); 255 resetvalues();
256 m_report.Enabled = true; 256 m_report.Enabled = true;
generated by cgit v1.1 at 2024-11-09 07:57:51 +0000