diff options
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneEvents.cs | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 62011ea..055af55 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs | |||
@@ -182,13 +182,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
182 | private RemoveScript handler016 = null; //OnRemoveScript; | 182 | private RemoveScript handler016 = null; //OnRemoveScript; |
183 | private SceneGroupMoved handler017 = null; //OnSceneGroupMove; | 183 | private SceneGroupMoved handler017 = null; //OnSceneGroupMove; |
184 | private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab; | 184 | private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab; |
185 | private LandObjectAdded handler020 = null; //OnLandObjectAdded; | 185 | private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded; |
186 | private LandObjectRemoved handler021 = null; //OnLandObjectRemoved; | 186 | private LandObjectRemoved handlerLandObjectRemoved = null; //OnLandObjectRemoved; |
187 | private AvatarEnteringNewParcel handler022 = null; //OnAvatarEnteringNewParcel; | 187 | private AvatarEnteringNewParcel handlerAvatarEnteringNewParcel = null; //OnAvatarEnteringNewParcel; |
188 | private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule; | 188 | private NewGridInstantMessage handlerGridInstantMessageToIM = null; //OnGridInstantMessageToIMModule; |
189 | private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule; | 189 | private NewGridInstantMessage handlerGridInstantMessageToFriends = null; //OnGridInstantMessageToFriendsModule; |
190 | private ClientClosed handler025 = null; //OnClientClosed; | 190 | private ClientClosed handlerClientClosed = null; //OnClientClosed; |
191 | private OnNewPresenceDelegate handler026 = null; //OnMakeChildAgent; | 191 | private OnNewPresenceDelegate handlerMakeChildAgent = null; //OnMakeChildAgent; |
192 | 192 | ||
193 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 193 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
194 | { | 194 | { |
@@ -343,20 +343,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
343 | 343 | ||
344 | public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) | 344 | public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) |
345 | { | 345 | { |
346 | handler020 = OnLandObjectAdded; | 346 | handlerLandObjectAdded = OnLandObjectAdded; |
347 | 347 | ||
348 | if (handler020 != null) | 348 | if (handlerLandObjectAdded != null) |
349 | { | 349 | { |
350 | handler020(newParcel, regionID); | 350 | handlerLandObjectAdded(newParcel, regionID); |
351 | } | 351 | } |
352 | } | 352 | } |
353 | 353 | ||
354 | public void TriggerLandObjectRemoved(LLUUID globalID) | 354 | public void TriggerLandObjectRemoved(LLUUID globalID) |
355 | { | 355 | { |
356 | handler021 = OnLandObjectRemoved; | 356 | handlerLandObjectRemoved = OnLandObjectRemoved; |
357 | if (handler021 != null) | 357 | if (handlerLandObjectRemoved != null) |
358 | { | 358 | { |
359 | handler021(globalID); | 359 | handlerLandObjectRemoved(globalID); |
360 | } | 360 | } |
361 | } | 361 | } |
362 | 362 | ||
@@ -369,11 +369,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
369 | 369 | ||
370 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) | 370 | public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) |
371 | { | 371 | { |
372 | handler022 = OnAvatarEnteringNewParcel; | 372 | handlerAvatarEnteringNewParcel = OnAvatarEnteringNewParcel; |
373 | 373 | ||
374 | if (handler022 != null) | 374 | if (handlerAvatarEnteringNewParcel != null) |
375 | { | 375 | { |
376 | handler022(avatar, localLandID, regionID); | 376 | handlerAvatarEnteringNewParcel(avatar, localLandID, regionID); |
377 | } | 377 | } |
378 | } | 378 | } |
379 | 379 | ||
@@ -384,18 +384,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
384 | { | 384 | { |
385 | if ((whichModule & InstantMessageReceiver.IMModule) != 0) | 385 | if ((whichModule & InstantMessageReceiver.IMModule) != 0) |
386 | { | 386 | { |
387 | handler023 = OnGridInstantMessageToIMModule; | 387 | handlerGridInstantMessageToIM = OnGridInstantMessageToIMModule; |
388 | if (handler023 != null) | 388 | if (handlerGridInstantMessageToIM != null) |
389 | { | 389 | { |
390 | handler023(message); | 390 | handlerGridInstantMessageToIM(message); |
391 | } | 391 | } |
392 | } | 392 | } |
393 | if ((whichModule & InstantMessageReceiver.FriendsModule) != 0) | 393 | if ((whichModule & InstantMessageReceiver.FriendsModule) != 0) |
394 | { | 394 | { |
395 | handler024 = OnGridInstantMessageToFriendsModule; | 395 | handlerGridInstantMessageToFriends = OnGridInstantMessageToFriendsModule; |
396 | if (handler024 != null) | 396 | if (handlerGridInstantMessageToFriends != null) |
397 | { | 397 | { |
398 | handler024(message); | 398 | handlerGridInstantMessageToFriends(message); |
399 | } | 399 | } |
400 | 400 | ||
401 | } | 401 | } |
@@ -403,19 +403,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
403 | 403 | ||
404 | public void TriggerClientClosed(LLUUID ClientID) | 404 | public void TriggerClientClosed(LLUUID ClientID) |
405 | { | 405 | { |
406 | handler025 = OnClientClosed; | 406 | handlerClientClosed = OnClientClosed; |
407 | if (handler025 != null) | 407 | if (handlerClientClosed != null) |
408 | { | 408 | { |
409 | handler025(ClientID); | 409 | handlerClientClosed(ClientID); |
410 | } | 410 | } |
411 | } | 411 | } |
412 | 412 | ||
413 | public void TriggerOnMakeChildAgent(ScenePresence presence) | 413 | public void TriggerOnMakeChildAgent(ScenePresence presence) |
414 | { | 414 | { |
415 | handler026 = OnMakeChildAgent; | 415 | handlerMakeChildAgent = OnMakeChildAgent; |
416 | if (handler026 != null) | 416 | if (handlerMakeChildAgent != null) |
417 | { | 417 | { |
418 | handler026(presence); | 418 | handlerMakeChildAgent(presence); |
419 | } | 419 | } |
420 | 420 | ||
421 | } | 421 | } |