diff options
author | Charles Krinke | 2008-03-02 20:29:59 +0000 |
---|---|---|
committer | Charles Krinke | 2008-03-02 20:29:59 +0000 |
commit | 30ebd15926fa5625b27bca783c13f007c593cbbd (patch) | |
tree | 0ac25573b0d125feb1919aa9e18a036f798d4105 /OpenSim/Region/Environment/Scenes | |
parent | Applying Ahzzmandius' second patch from bug 701. (diff) | |
download | opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.zip opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.gz opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.bz2 opensim-SC-30ebd15926fa5625b27bca783c13f007c593cbbd.tar.xz |
Update names of handler010 through handler019
to more appropriate names consistent with use.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 72 |
1 files changed, 36 insertions, 36 deletions
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 | ||