aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs16
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs82
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs72
3 files changed, 85 insertions, 85 deletions
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 35e2f26..4d9411d 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Framework
55 private AcknowledgeAgentCross handler007 = null; // OnAcknowledgeAgentCrossed; 55 private AcknowledgeAgentCross handler007 = null; // OnAcknowledgeAgentCrossed;
56 private AcknowledgePrimCross handler008 = null; // OnAcknowledgePrimCrossed; 56 private AcknowledgePrimCross handler008 = null; // OnAcknowledgePrimCrossed;
57 private CloseAgentConnection handler009 = null; // OnCloseAgentConnection; 57 private CloseAgentConnection handler009 = null; // OnCloseAgentConnection;
58 private RegionUp handler010 = null; // OnRegionUp; 58 private RegionUp handlerRegionUp = null; // OnRegionUp;
59 private ChildAgentUpdate handler011 = null; // OnChildAgentUpdate; 59 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
60 60
61 public string debugRegionName = String.Empty; 61 public string debugRegionName = String.Empty;
62 62
@@ -92,10 +92,10 @@ namespace OpenSim.Framework
92 92
93 public virtual bool TriggerRegionUp(RegionInfo region) 93 public virtual bool TriggerRegionUp(RegionInfo region)
94 { 94 {
95 handler010 = OnRegionUp; 95 handlerRegionUp = OnRegionUp;
96 if (handler010 != null) 96 if (handlerRegionUp != null)
97 { 97 {
98 handler010(region); 98 handlerRegionUp(region);
99 return true; 99 return true;
100 } 100 }
101 return false; 101 return false;
@@ -103,10 +103,10 @@ namespace OpenSim.Framework
103 103
104 public virtual bool TriggerChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) 104 public virtual bool TriggerChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData)
105 { 105 {
106 handler011 = OnChildAgentUpdate; 106 handlerChildAgentUpdate = OnChildAgentUpdate;
107 if (handler011 != null) 107 if (handlerChildAgentUpdate != null)
108 { 108 {
109 handler011(regionHandle, cAgentData); 109 handlerChildAgentUpdate(regionHandle, cAgentData);
110 return true; 110 return true;
111 } 111 }
112 return false; 112 return false;
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index af5a8e5..eb50042 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -131,16 +131,16 @@ namespace OpenSim.Region.ClientStack
131 private RezObject handler007 = null; //OnRezObject; 131 private RezObject handler007 = null; //OnRezObject;
132 private GenericCall4 handler008 = null; //OnDeRezObject; 132 private GenericCall4 handler008 = null; //OnDeRezObject;
133 private ModifyTerrain handler009 = null; 133 private ModifyTerrain handler009 = null;
134 private Action<IClientAPI> handler010 = null; //OnRegionHandShakeReply; 134 private Action<IClientAPI> handlerRegionHandShakeReply = null; //OnRegionHandShakeReply;
135 private GenericCall2 handler011 = null; //OnRequestWearables; 135 private GenericCall2 handlerRequestWearables = null; //OnRequestWearables;
136 private Action<IClientAPI> handler012 = null; //OnRequestAvatarsData; 136 private Action<IClientAPI> handlerRequestAvatarsData = null; //OnRequestAvatarsData;
137 private SetAppearance handler013 = null; //OnSetAppearance; 137 private SetAppearance handlerSetAppearance = null; //OnSetAppearance;
138 private AvatarNowWearing handler014 = null; //OnAvatarNowWearing; 138 private AvatarNowWearing handlerAvatarNowWearing = null; //OnAvatarNowWearing;
139 private RezSingleAttachmentFromInv handler015 = null; //OnRezSingleAttachmentFromInv; 139 private RezSingleAttachmentFromInv handlerRezSingleAttachment = null; //OnRezSingleAttachmentFromInv;
140 private ObjectAttach handler016 = null; //OnObjectAttach; 140 private ObjectAttach handlerObjectAttach = null; //OnObjectAttach;
141 private SetAlwaysRun handler017 = null; //OnSetAlwaysRun; 141 private SetAlwaysRun handlerSetAlwaysRun = null; //OnSetAlwaysRun;
142 private GenericCall2 handler018 = null; //OnCompleteMovementToRegion; 142 private GenericCall2 handlerCompleteMovementToRegion = null; //OnCompleteMovementToRegion;
143 private UpdateAgent handler019 = null; //OnAgentUpdate; 143 private UpdateAgent handlerAgentUpdate = null; //OnAgentUpdate;
144 private StartAnim handlerStartAnim = null; 144 private StartAnim handlerStartAnim = null;
145 private StopAnim handlerStopAnim = null; 145 private StopAnim handlerStopAnim = null;
146 private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit; 146 private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit;
@@ -3042,27 +3042,27 @@ namespace OpenSim.Region.ClientStack
3042 break; 3042 break;
3043 case PacketType.RegionHandshakeReply: 3043 case PacketType.RegionHandshakeReply:
3044 3044
3045 handler010 = OnRegionHandShakeReply; 3045 handlerRegionHandShakeReply = OnRegionHandShakeReply;
3046 if (handler010 != null) 3046 if (handlerRegionHandShakeReply != null)
3047 { 3047 {
3048 handler010(this); 3048 handlerRegionHandShakeReply(this);
3049 } 3049 }
3050 3050
3051 break; 3051 break;
3052 case PacketType.AgentWearablesRequest: 3052 case PacketType.AgentWearablesRequest:
3053 handler011 = OnRequestWearables; 3053 handlerRequestWearables = OnRequestWearables;
3054 3054
3055 if (handler011 != null) 3055 if (handlerRequestWearables != null)
3056 { 3056 {
3057 handler011(); 3057 handlerRequestWearables();
3058 } 3058 }
3059 3059
3060 3060
3061 handler012 = OnRequestAvatarsData; 3061 handlerRequestAvatarsData = OnRequestAvatarsData;
3062 3062
3063 if (handler012 != null) 3063 if (handlerRequestAvatarsData != null)
3064 { 3064 {
3065 handler012(this); 3065 handlerRequestAvatarsData(this);
3066 } 3066 }
3067 3067
3068 3068
@@ -3070,10 +3070,10 @@ namespace OpenSim.Region.ClientStack
3070 case PacketType.AgentSetAppearance: 3070 case PacketType.AgentSetAppearance:
3071 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack; 3071 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
3072 3072
3073 handler013 = OnSetAppearance; 3073 handlerSetAppearance = OnSetAppearance;
3074 if (handler013 != null) 3074 if (handlerSetAppearance != null)
3075 { 3075 {
3076 handler013(appear.ObjectData.TextureEntry, appear.VisualParam); 3076 handlerSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
3077 } 3077 }
3078 3078
3079 break; 3079 break;
@@ -3090,10 +3090,10 @@ namespace OpenSim.Region.ClientStack
3090 wearingArgs.NowWearing.Add(wearable); 3090 wearingArgs.NowWearing.Add(wearable);
3091 } 3091 }
3092 3092
3093 handler014 = OnAvatarNowWearing; 3093 handlerAvatarNowWearing = OnAvatarNowWearing;
3094 if (handler014 != null) 3094 if (handlerAvatarNowWearing != null)
3095 { 3095 {
3096 handler014(this, wearingArgs); 3096 handlerAvatarNowWearing(this, wearingArgs);
3097 } 3097 }
3098 3098
3099 3099
@@ -3101,11 +3101,11 @@ namespace OpenSim.Region.ClientStack
3101 break; 3101 break;
3102 case PacketType.RezSingleAttachmentFromInv: 3102 case PacketType.RezSingleAttachmentFromInv:
3103 3103
3104 handler015 = OnRezSingleAttachmentFromInv; 3104 handlerRezSingleAttachment = OnRezSingleAttachmentFromInv;
3105 if (handler015 != null) 3105 if (handlerRezSingleAttachment != null)
3106 { 3106 {
3107 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack; 3107 RezSingleAttachmentFromInvPacket rez = (RezSingleAttachmentFromInvPacket)Pack;
3108 handler015(this, rez.ObjectData.ItemID, 3108 handlerRezSingleAttachment(this, rez.ObjectData.ItemID,
3109 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask); 3109 rez.ObjectData.AttachmentPt, rez.ObjectData.ItemFlags, rez.ObjectData.NextOwnerMask);
3110 } 3110 }
3111 3111
@@ -3117,11 +3117,11 @@ namespace OpenSim.Region.ClientStack
3117 { 3117 {
3118 ObjectAttachPacket att = (ObjectAttachPacket)Pack; 3118 ObjectAttachPacket att = (ObjectAttachPacket)Pack;
3119 3119
3120 handler016 = OnObjectAttach; 3120 handlerObjectAttach = OnObjectAttach;
3121 3121
3122 if (handler016 != null) 3122 if (handlerObjectAttach != null)
3123 { 3123 {
3124 handler016(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation); 3124 handlerObjectAttach(this, att.ObjectData[0].ObjectLocalID, att.AgentData.AttachmentPoint, att.ObjectData[0].Rotation);
3125 } 3125 }
3126 } 3126 }
3127 3127
@@ -3129,21 +3129,21 @@ namespace OpenSim.Region.ClientStack
3129 case PacketType.SetAlwaysRun: 3129 case PacketType.SetAlwaysRun:
3130 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack; 3130 SetAlwaysRunPacket run = (SetAlwaysRunPacket)Pack;
3131 3131
3132 handler017 = OnSetAlwaysRun; 3132 handlerSetAlwaysRun = OnSetAlwaysRun;
3133 if (handler017 != null) 3133 if (handlerSetAlwaysRun != null)
3134 handler017(this, run.AgentData.AlwaysRun); 3134 handlerSetAlwaysRun(this, run.AgentData.AlwaysRun);
3135 3135
3136 3136
3137 3137
3138 break; 3138 break;
3139 case PacketType.CompleteAgentMovement: 3139 case PacketType.CompleteAgentMovement:
3140 3140
3141 handler018 = OnCompleteMovementToRegion; 3141 handlerCompleteMovementToRegion = OnCompleteMovementToRegion;
3142 if (handler018 != null) 3142 if (handlerCompleteMovementToRegion != null)
3143 { 3143 {
3144 handler018(); 3144 handlerCompleteMovementToRegion();
3145 } 3145 }
3146 handler018 = null; 3146 handlerCompleteMovementToRegion = null;
3147 3147
3148 break; 3148 break;
3149 case PacketType.AgentUpdate: 3149 case PacketType.AgentUpdate:
@@ -3151,11 +3151,11 @@ namespace OpenSim.Region.ClientStack
3151 { 3151 {
3152 AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack; 3152 AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
3153 3153
3154 handler019 = OnAgentUpdate; 3154 handlerAgentUpdate = OnAgentUpdate;
3155 if (handler019 != null) 3155 if (handlerAgentUpdate != null)
3156 OnAgentUpdate(this, agenUpdate); 3156 OnAgentUpdate(this, agenUpdate);
3157 3157
3158 handler019 = null; 3158 handlerAgentUpdate = null;
3159 //agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotationa); 3159 //agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotationa);
3160 } 3160 }
3161 break; 3161 break;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 055af55..96b3ccb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -173,15 +173,15 @@ namespace OpenSim.Region.Environment.Scenes
173 private OnNewPresenceDelegate handler007 = null; //OnNewPresence; 173 private OnNewPresenceDelegate handler007 = null; //OnNewPresence;
174 private OnRemovePresenceDelegate handler008 = null; //OnRemovePresence; 174 private OnRemovePresenceDelegate handler008 = null; //OnRemovePresence;
175 private OnBackupDelegate handler009 = null; //OnBackup; 175 private OnBackupDelegate handler009 = null; //OnBackup;
176 private OnParcelPrimCountUpdateDelegate handler010 = null; //OnParcelPrimCountUpdate; 176 private OnParcelPrimCountUpdateDelegate handlerParcelPrimCountUpdate = null; //OnParcelPrimCountUpdate;
177 private MoneyTransferEvent handler011 = null; //OnMoneyTransfer; 177 private MoneyTransferEvent handlerMoneyTransfer = null; //OnMoneyTransfer;
178 private OnParcelPrimCountAddDelegate handler012 = null; //OnParcelPrimCountAdd; 178 private OnParcelPrimCountAddDelegate handlerParcelPrimCountAdd = null; //OnParcelPrimCountAdd;
179 private OnShutdownDelegate handler013 = null; //OnShutdown; 179 private OnShutdownDelegate handlerShutdown = null; //OnShutdown;
180 private ObjectGrabDelegate handler014 = null; //OnObjectGrab; 180 private ObjectGrabDelegate handlerObjectGrab = null; //OnObjectGrab;
181 private NewRezScript handler015 = null; //OnRezScript; 181 private NewRezScript handlerRezScript = null; //OnRezScript;
182 private RemoveScript handler016 = null; //OnRemoveScript; 182 private RemoveScript handlerRemoveScript = null; //OnRemoveScript;
183 private SceneGroupMoved handler017 = null; //OnSceneGroupMove; 183 private SceneGroupMoved handlerSceneGroupMove = null; //OnSceneGroupMove;
184 private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab; 184 private SceneGroupGrabed handlerSceneGroupGrab = null; //OnSceneGroupGrab;
185 private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded; 185 private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded;
186 private LandObjectRemoved handlerLandObjectRemoved = null; //OnLandObjectRemoved; 186 private LandObjectRemoved handlerLandObjectRemoved = null; //OnLandObjectRemoved;
187 private AvatarEnteringNewParcel handlerAvatarEnteringNewParcel = null; //OnAvatarEnteringNewParcel; 187 private AvatarEnteringNewParcel handlerAvatarEnteringNewParcel = null; //OnAvatarEnteringNewParcel;
@@ -261,83 +261,83 @@ namespace OpenSim.Region.Environment.Scenes
261 261
262 public void TriggerParcelPrimCountUpdate() 262 public void TriggerParcelPrimCountUpdate()
263 { 263 {
264 handler010 = OnParcelPrimCountUpdate; 264 handlerParcelPrimCountUpdate = OnParcelPrimCountUpdate;
265 if (handler010 != null) 265 if (handlerParcelPrimCountUpdate != null)
266 { 266 {
267 handler010(); 267 handlerParcelPrimCountUpdate();
268 } 268 }
269 } 269 }
270 270
271 public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs e) 271 public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs e)
272 { 272 {
273 handler011 = OnMoneyTransfer; 273 handlerMoneyTransfer = OnMoneyTransfer;
274 if (handler011 != null) 274 if (handlerMoneyTransfer != null)
275 { 275 {
276 handler011(sender, e); 276 handlerMoneyTransfer(sender, e);
277 } 277 }
278 } 278 }
279 279
280 280
281 public void TriggerParcelPrimCountAdd(SceneObjectGroup obj) 281 public void TriggerParcelPrimCountAdd(SceneObjectGroup obj)
282 { 282 {
283 handler012 = OnParcelPrimCountAdd; 283 handlerParcelPrimCountAdd = OnParcelPrimCountAdd;
284 if (handler012 != null) 284 if (handlerParcelPrimCountAdd != null)
285 { 285 {
286 handler012(obj); 286 handlerParcelPrimCountAdd(obj);
287 } 287 }
288 } 288 }
289 289
290 public void TriggerShutdown() 290 public void TriggerShutdown()
291 { 291 {
292 handler013 = OnShutdown; 292 handlerShutdown = OnShutdown;
293 if (handler013 != null) 293 if (handlerShutdown != null)
294 handler013(); 294 handlerShutdown();
295 } 295 }
296 296
297 public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) 297 public void TriggerObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient)
298 { 298 {
299 handler014 = OnObjectGrab; 299 handlerObjectGrab = OnObjectGrab;
300 if (handler014 != null) 300 if (handlerObjectGrab != null)
301 { 301 {
302 handler014(localID, offsetPos, remoteClient); 302 handlerObjectGrab(localID, offsetPos, remoteClient);
303 } 303 }
304 } 304 }
305 305
306 public void TriggerRezScript(uint localID, LLUUID itemID, string script) 306 public void TriggerRezScript(uint localID, LLUUID itemID, string script)
307 { 307 {
308 handler015 = OnRezScript; 308 handlerRezScript = OnRezScript;
309 if (handler015 != null) 309 if (handlerRezScript != null)
310 { 310 {
311 handler015(localID, itemID, script); 311 handlerRezScript(localID, itemID, script);
312 } 312 }
313 } 313 }
314 314
315 public void TriggerRemoveScript(uint localID, LLUUID itemID) 315 public void TriggerRemoveScript(uint localID, LLUUID itemID)
316 { 316 {
317 handler016 = OnRemoveScript; 317 handlerRemoveScript = OnRemoveScript;
318 if (handler016 != null) 318 if (handlerRemoveScript != null)
319 { 319 {
320 handler016(localID, itemID); 320 handlerRemoveScript(localID, itemID);
321 } 321 }
322 } 322 }
323 323
324 public bool TriggerGroupMove(LLUUID groupID, LLVector3 delta) 324 public bool TriggerGroupMove(LLUUID groupID, LLVector3 delta)
325 { 325 {
326 handler017 = OnSceneGroupMove; 326 handlerSceneGroupMove = OnSceneGroupMove;
327 327
328 if (handler017 != null) 328 if (handlerSceneGroupMove != null)
329 { 329 {
330 return handler017(groupID, delta); 330 return handlerSceneGroupMove(groupID, delta);
331 } 331 }
332 return true; 332 return true;
333 } 333 }
334 334
335 public void TriggerGroupGrab(LLUUID groupID, LLVector3 offset, LLUUID userID) 335 public void TriggerGroupGrab(LLUUID groupID, LLVector3 offset, LLUUID userID)
336 { 336 {
337 handler018 = OnSceneGroupGrab; 337 handlerSceneGroupGrab = OnSceneGroupGrab;
338 if (handler018 != null) 338 if (handlerSceneGroupGrab != null)
339 { 339 {
340 handler018(groupID, offset, userID); 340 handlerSceneGroupGrab(groupID, offset, userID);
341 } 341 }
342 } 342 }
343 343