diff options
author | Melanie | 2010-03-03 02:07:03 +0000 |
---|---|---|
committer | Melanie | 2010-03-03 02:07:03 +0000 |
commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
parent | Revert "test" (diff) | |
parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 199 |
1 files changed, 112 insertions, 87 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 22909bc..3cce53d 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -66,13 +66,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
66 | public event OnClientConnectCoreDelegate OnClientConnect; | 66 | public event OnClientConnectCoreDelegate OnClientConnect; |
67 | 67 | ||
68 | public delegate void OnNewClientDelegate(IClientAPI client); | 68 | public delegate void OnNewClientDelegate(IClientAPI client); |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// Deprecated in favour of OnClientConnect. | 71 | /// Deprecated in favour of OnClientConnect. |
72 | /// Will be marked Obsolete after IClientCore has 100% of IClientAPI interfaces. | 72 | /// Will be marked Obsolete after IClientCore has 100% of IClientAPI interfaces. |
73 | /// </summary> | 73 | /// </summary> |
74 | public event OnNewClientDelegate OnNewClient; | 74 | public event OnNewClientDelegate OnNewClient; |
75 | 75 | ||
76 | public delegate void OnClientLoginDelegate(IClientAPI client); | ||
77 | public event OnClientLoginDelegate OnClientLogin; | ||
78 | |||
76 | public delegate void OnNewPresenceDelegate(ScenePresence presence); | 79 | public delegate void OnNewPresenceDelegate(ScenePresence presence); |
77 | 80 | ||
78 | public event OnNewPresenceDelegate OnNewPresence; | 81 | public event OnNewPresenceDelegate OnNewPresence; |
@@ -213,7 +216,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
213 | /// Triggered when an object or attachment enters a scene | 216 | /// Triggered when an object or attachment enters a scene |
214 | /// </summary> | 217 | /// </summary> |
215 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; | 218 | public event OnIncomingSceneObjectDelegate OnIncomingSceneObject; |
216 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); | 219 | public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so); |
217 | 220 | ||
218 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); | 221 | public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel); |
219 | 222 | ||
@@ -417,7 +420,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
417 | } | 420 | } |
418 | } | 421 | } |
419 | } | 422 | } |
420 | } | 423 | } |
421 | 424 | ||
422 | public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) | 425 | public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) |
423 | { | 426 | { |
@@ -437,7 +440,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
437 | e.Message, e.StackTrace); | 440 | e.Message, e.StackTrace); |
438 | } | 441 | } |
439 | } | 442 | } |
440 | } | 443 | } |
441 | } | 444 | } |
442 | 445 | ||
443 | public void TriggerOnScriptChangedEvent(uint localID, uint change) | 446 | public void TriggerOnScriptChangedEvent(uint localID, uint change) |
@@ -458,7 +461,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
458 | e.Message, e.StackTrace); | 461 | e.Message, e.StackTrace); |
459 | } | 462 | } |
460 | } | 463 | } |
461 | } | 464 | } |
462 | } | 465 | } |
463 | 466 | ||
464 | public void TriggerOnClientMovement(ScenePresence avatar) | 467 | public void TriggerOnClientMovement(ScenePresence avatar) |
@@ -479,7 +482,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
479 | e.Message, e.StackTrace); | 482 | e.Message, e.StackTrace); |
480 | } | 483 | } |
481 | } | 484 | } |
482 | } | 485 | } |
483 | } | 486 | } |
484 | 487 | ||
485 | public void TriggerPermissionError(UUID user, string reason) | 488 | public void TriggerPermissionError(UUID user, string reason) |
@@ -500,7 +503,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
500 | e.Message, e.StackTrace); | 503 | e.Message, e.StackTrace); |
501 | } | 504 | } |
502 | } | 505 | } |
503 | } | 506 | } |
504 | } | 507 | } |
505 | 508 | ||
506 | public void TriggerOnPluginConsole(string[] args) | 509 | public void TriggerOnPluginConsole(string[] args) |
@@ -521,7 +524,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
521 | e.Message, e.StackTrace); | 524 | e.Message, e.StackTrace); |
522 | } | 525 | } |
523 | } | 526 | } |
524 | } | 527 | } |
525 | } | 528 | } |
526 | 529 | ||
527 | public void TriggerOnFrame() | 530 | public void TriggerOnFrame() |
@@ -542,11 +545,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
542 | e.Message, e.StackTrace); | 545 | e.Message, e.StackTrace); |
543 | } | 546 | } |
544 | } | 547 | } |
545 | } | 548 | } |
546 | } | 549 | } |
547 | 550 | ||
548 | public void TriggerOnNewClient(IClientAPI client) | 551 | public void TriggerOnNewClient(IClientAPI client) |
549 | { | 552 | { |
550 | OnNewClientDelegate handlerNewClient = OnNewClient; | 553 | OnNewClientDelegate handlerNewClient = OnNewClient; |
551 | if (handlerNewClient != null) | 554 | if (handlerNewClient != null) |
552 | { | 555 | { |
@@ -563,10 +566,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
563 | e.Message, e.StackTrace); | 566 | e.Message, e.StackTrace); |
564 | } | 567 | } |
565 | } | 568 | } |
566 | } | 569 | } |
567 | 570 | ||
568 | if (client is IClientCore) | 571 | if (client is IClientCore) |
569 | { | 572 | { |
570 | OnClientConnectCoreDelegate handlerClientConnect = OnClientConnect; | 573 | OnClientConnectCoreDelegate handlerClientConnect = OnClientConnect; |
571 | if (handlerClientConnect != null) | 574 | if (handlerClientConnect != null) |
572 | { | 575 | { |
@@ -583,10 +586,32 @@ namespace OpenSim.Region.Framework.Scenes | |||
583 | e.Message, e.StackTrace); | 586 | e.Message, e.StackTrace); |
584 | } | 587 | } |
585 | } | 588 | } |
586 | } | 589 | } |
587 | } | 590 | } |
588 | } | 591 | } |
589 | 592 | ||
593 | public void TriggerOnClientLogin(IClientAPI client) | ||
594 | { | ||
595 | OnClientLoginDelegate handlerClientLogin = OnClientLogin; | ||
596 | if (handlerClientLogin != null) | ||
597 | { | ||
598 | foreach (OnClientLoginDelegate d in handlerClientLogin.GetInvocationList()) | ||
599 | { | ||
600 | try | ||
601 | { | ||
602 | d(client); | ||
603 | } | ||
604 | catch (Exception e) | ||
605 | { | ||
606 | m_log.ErrorFormat( | ||
607 | "[EVENT MANAGER]: Delegate for TriggerOnClientLogin failed - continuing. {0} {1}", | ||
608 | e.Message, e.StackTrace); | ||
609 | } | ||
610 | } | ||
611 | } | ||
612 | |||
613 | } | ||
614 | |||
590 | public void TriggerOnNewPresence(ScenePresence presence) | 615 | public void TriggerOnNewPresence(ScenePresence presence) |
591 | { | 616 | { |
592 | OnNewPresenceDelegate handlerNewPresence = OnNewPresence; | 617 | OnNewPresenceDelegate handlerNewPresence = OnNewPresence; |
@@ -605,11 +630,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
605 | e.Message, e.StackTrace); | 630 | e.Message, e.StackTrace); |
606 | } | 631 | } |
607 | } | 632 | } |
608 | } | 633 | } |
609 | } | 634 | } |
610 | 635 | ||
611 | public void TriggerOnRemovePresence(UUID agentId) | 636 | public void TriggerOnRemovePresence(UUID agentId) |
612 | { | 637 | { |
613 | OnRemovePresenceDelegate handlerRemovePresence = OnRemovePresence; | 638 | OnRemovePresenceDelegate handlerRemovePresence = OnRemovePresence; |
614 | if (handlerRemovePresence != null) | 639 | if (handlerRemovePresence != null) |
615 | { | 640 | { |
@@ -626,11 +651,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
626 | e.Message, e.StackTrace); | 651 | e.Message, e.StackTrace); |
627 | } | 652 | } |
628 | } | 653 | } |
629 | } | 654 | } |
630 | } | 655 | } |
631 | 656 | ||
632 | public void TriggerOnBackup(IRegionDataStore dstore) | 657 | public void TriggerOnBackup(IRegionDataStore dstore) |
633 | { | 658 | { |
634 | OnBackupDelegate handlerOnAttach = OnBackup; | 659 | OnBackupDelegate handlerOnAttach = OnBackup; |
635 | if (handlerOnAttach != null) | 660 | if (handlerOnAttach != null) |
636 | { | 661 | { |
@@ -647,7 +672,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
647 | e.Message, e.StackTrace); | 672 | e.Message, e.StackTrace); |
648 | } | 673 | } |
649 | } | 674 | } |
650 | } | 675 | } |
651 | } | 676 | } |
652 | 677 | ||
653 | public void TriggerParcelPrimCountUpdate() | 678 | public void TriggerParcelPrimCountUpdate() |
@@ -668,7 +693,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
668 | e.Message, e.StackTrace); | 693 | e.Message, e.StackTrace); |
669 | } | 694 | } |
670 | } | 695 | } |
671 | } | 696 | } |
672 | } | 697 | } |
673 | 698 | ||
674 | public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs args) | 699 | public void TriggerMoneyTransfer(Object sender, MoneyTransferArgs args) |
@@ -689,7 +714,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
689 | e.Message, e.StackTrace); | 714 | e.Message, e.StackTrace); |
690 | } | 715 | } |
691 | } | 716 | } |
692 | } | 717 | } |
693 | } | 718 | } |
694 | 719 | ||
695 | public void TriggerTerrainTick() | 720 | public void TriggerTerrainTick() |
@@ -710,7 +735,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
710 | e.Message, e.StackTrace); | 735 | e.Message, e.StackTrace); |
711 | } | 736 | } |
712 | } | 737 | } |
713 | } | 738 | } |
714 | } | 739 | } |
715 | 740 | ||
716 | public void TriggerParcelPrimCountAdd(SceneObjectGroup obj) | 741 | public void TriggerParcelPrimCountAdd(SceneObjectGroup obj) |
@@ -731,7 +756,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
731 | e.Message, e.StackTrace); | 756 | e.Message, e.StackTrace); |
732 | } | 757 | } |
733 | } | 758 | } |
734 | } | 759 | } |
735 | } | 760 | } |
736 | 761 | ||
737 | public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj) | 762 | public void TriggerObjectBeingRemovedFromScene(SceneObjectGroup obj) |
@@ -752,11 +777,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
752 | e.Message, e.StackTrace); | 777 | e.Message, e.StackTrace); |
753 | } | 778 | } |
754 | } | 779 | } |
755 | } | 780 | } |
756 | } | 781 | } |
757 | 782 | ||
758 | public void TriggerShutdown() | 783 | public void TriggerShutdown() |
759 | { | 784 | { |
760 | OnShutdownDelegate handlerShutdown = OnShutdown; | 785 | OnShutdownDelegate handlerShutdown = OnShutdown; |
761 | if (handlerShutdown != null) | 786 | if (handlerShutdown != null) |
762 | { | 787 | { |
@@ -773,11 +798,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
773 | e.Message, e.StackTrace); | 798 | e.Message, e.StackTrace); |
774 | } | 799 | } |
775 | } | 800 | } |
776 | } | 801 | } |
777 | } | 802 | } |
778 | 803 | ||
779 | public void TriggerObjectGrab(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) | 804 | public void TriggerObjectGrab(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) |
780 | { | 805 | { |
781 | ObjectGrabDelegate handlerObjectGrab = OnObjectGrab; | 806 | ObjectGrabDelegate handlerObjectGrab = OnObjectGrab; |
782 | if (handlerObjectGrab != null) | 807 | if (handlerObjectGrab != null) |
783 | { | 808 | { |
@@ -794,11 +819,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
794 | e.Message, e.StackTrace); | 819 | e.Message, e.StackTrace); |
795 | } | 820 | } |
796 | } | 821 | } |
797 | } | 822 | } |
798 | } | 823 | } |
799 | 824 | ||
800 | public void TriggerObjectGrabbing(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) | 825 | public void TriggerObjectGrabbing(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) |
801 | { | 826 | { |
802 | ObjectGrabDelegate handlerObjectGrabbing = OnObjectGrabbing; | 827 | ObjectGrabDelegate handlerObjectGrabbing = OnObjectGrabbing; |
803 | if (handlerObjectGrabbing != null) | 828 | if (handlerObjectGrabbing != null) |
804 | { | 829 | { |
@@ -815,11 +840,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
815 | e.Message, e.StackTrace); | 840 | e.Message, e.StackTrace); |
816 | } | 841 | } |
817 | } | 842 | } |
818 | } | 843 | } |
819 | } | 844 | } |
820 | 845 | ||
821 | public void TriggerObjectDeGrab(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) | 846 | public void TriggerObjectDeGrab(uint localID, uint originalID, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs) |
822 | { | 847 | { |
823 | ObjectDeGrabDelegate handlerObjectDeGrab = OnObjectDeGrab; | 848 | ObjectDeGrabDelegate handlerObjectDeGrab = OnObjectDeGrab; |
824 | if (handlerObjectDeGrab != null) | 849 | if (handlerObjectDeGrab != null) |
825 | { | 850 | { |
@@ -836,11 +861,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
836 | e.Message, e.StackTrace); | 861 | e.Message, e.StackTrace); |
837 | } | 862 | } |
838 | } | 863 | } |
839 | } | 864 | } |
840 | } | 865 | } |
841 | 866 | ||
842 | public void TriggerScriptReset(uint localID, UUID itemID) | 867 | public void TriggerScriptReset(uint localID, UUID itemID) |
843 | { | 868 | { |
844 | ScriptResetDelegate handlerScriptReset = OnScriptReset; | 869 | ScriptResetDelegate handlerScriptReset = OnScriptReset; |
845 | if (handlerScriptReset != null) | 870 | if (handlerScriptReset != null) |
846 | { | 871 | { |
@@ -857,11 +882,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
857 | e.Message, e.StackTrace); | 882 | e.Message, e.StackTrace); |
858 | } | 883 | } |
859 | } | 884 | } |
860 | } | 885 | } |
861 | } | 886 | } |
862 | 887 | ||
863 | public void TriggerRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) | 888 | public void TriggerRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) |
864 | { | 889 | { |
865 | NewRezScript handlerRezScript = OnRezScript; | 890 | NewRezScript handlerRezScript = OnRezScript; |
866 | if (handlerRezScript != null) | 891 | if (handlerRezScript != null) |
867 | { | 892 | { |
@@ -878,7 +903,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
878 | e.Message, e.StackTrace); | 903 | e.Message, e.StackTrace); |
879 | } | 904 | } |
880 | } | 905 | } |
881 | } | 906 | } |
882 | } | 907 | } |
883 | 908 | ||
884 | public void TriggerStartScript(uint localID, UUID itemID) | 909 | public void TriggerStartScript(uint localID, UUID itemID) |
@@ -899,7 +924,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
899 | e.Message, e.StackTrace); | 924 | e.Message, e.StackTrace); |
900 | } | 925 | } |
901 | } | 926 | } |
902 | } | 927 | } |
903 | } | 928 | } |
904 | 929 | ||
905 | public void TriggerStopScript(uint localID, UUID itemID) | 930 | public void TriggerStopScript(uint localID, UUID itemID) |
@@ -920,11 +945,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
920 | e.Message, e.StackTrace); | 945 | e.Message, e.StackTrace); |
921 | } | 946 | } |
922 | } | 947 | } |
923 | } | 948 | } |
924 | } | 949 | } |
925 | 950 | ||
926 | public void TriggerRemoveScript(uint localID, UUID itemID) | 951 | public void TriggerRemoveScript(uint localID, UUID itemID) |
927 | { | 952 | { |
928 | RemoveScript handlerRemoveScript = OnRemoveScript; | 953 | RemoveScript handlerRemoveScript = OnRemoveScript; |
929 | if (handlerRemoveScript != null) | 954 | if (handlerRemoveScript != null) |
930 | { | 955 | { |
@@ -941,7 +966,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
941 | e.Message, e.StackTrace); | 966 | e.Message, e.StackTrace); |
942 | } | 967 | } |
943 | } | 968 | } |
944 | } | 969 | } |
945 | } | 970 | } |
946 | 971 | ||
947 | public bool TriggerGroupMove(UUID groupID, Vector3 delta) | 972 | public bool TriggerGroupMove(UUID groupID, Vector3 delta) |
@@ -1040,7 +1065,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1040 | e.Message, e.StackTrace); | 1065 | e.Message, e.StackTrace); |
1041 | } | 1066 | } |
1042 | } | 1067 | } |
1043 | } | 1068 | } |
1044 | } | 1069 | } |
1045 | 1070 | ||
1046 | public void TriggerLandObjectAdded(ILandObject newParcel) | 1071 | public void TriggerLandObjectAdded(ILandObject newParcel) |
@@ -1061,7 +1086,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1061 | e.Message, e.StackTrace); | 1086 | e.Message, e.StackTrace); |
1062 | } | 1087 | } |
1063 | } | 1088 | } |
1064 | } | 1089 | } |
1065 | } | 1090 | } |
1066 | 1091 | ||
1067 | public void TriggerLandObjectRemoved(UUID globalID) | 1092 | public void TriggerLandObjectRemoved(UUID globalID) |
@@ -1082,7 +1107,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1082 | e.Message, e.StackTrace); | 1107 | e.Message, e.StackTrace); |
1083 | } | 1108 | } |
1084 | } | 1109 | } |
1085 | } | 1110 | } |
1086 | } | 1111 | } |
1087 | 1112 | ||
1088 | public void TriggerLandObjectUpdated(uint localParcelID, ILandObject newParcel) | 1113 | public void TriggerLandObjectUpdated(uint localParcelID, ILandObject newParcel) |
@@ -1108,7 +1133,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1108 | e.Message, e.StackTrace); | 1133 | e.Message, e.StackTrace); |
1109 | } | 1134 | } |
1110 | } | 1135 | } |
1111 | } | 1136 | } |
1112 | } | 1137 | } |
1113 | 1138 | ||
1114 | public void TriggerIncomingInstantMessage(GridInstantMessage message) | 1139 | public void TriggerIncomingInstantMessage(GridInstantMessage message) |
@@ -1129,7 +1154,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1129 | e.Message, e.StackTrace); | 1154 | e.Message, e.StackTrace); |
1130 | } | 1155 | } |
1131 | } | 1156 | } |
1132 | } | 1157 | } |
1133 | } | 1158 | } |
1134 | 1159 | ||
1135 | public void TriggerUnhandledInstantMessage(GridInstantMessage message) | 1160 | public void TriggerUnhandledInstantMessage(GridInstantMessage message) |
@@ -1150,7 +1175,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1150 | e.Message, e.StackTrace); | 1175 | e.Message, e.StackTrace); |
1151 | } | 1176 | } |
1152 | } | 1177 | } |
1153 | } | 1178 | } |
1154 | } | 1179 | } |
1155 | 1180 | ||
1156 | public void TriggerClientClosed(UUID ClientID, Scene scene) | 1181 | public void TriggerClientClosed(UUID ClientID, Scene scene) |
@@ -1171,7 +1196,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1171 | e.Message, e.StackTrace); | 1196 | e.Message, e.StackTrace); |
1172 | } | 1197 | } |
1173 | } | 1198 | } |
1174 | } | 1199 | } |
1175 | } | 1200 | } |
1176 | 1201 | ||
1177 | public void TriggerOnMakeChildAgent(ScenePresence presence) | 1202 | public void TriggerOnMakeChildAgent(ScenePresence presence) |
@@ -1192,7 +1217,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1192 | e.Message, e.StackTrace); | 1217 | e.Message, e.StackTrace); |
1193 | } | 1218 | } |
1194 | } | 1219 | } |
1195 | } | 1220 | } |
1196 | } | 1221 | } |
1197 | 1222 | ||
1198 | public void TriggerOnSendNewWindlightProfileTargeted(RegionMeta7WindlightData wl, UUID user) | 1223 | public void TriggerOnSendNewWindlightProfileTargeted(RegionMeta7WindlightData wl, UUID user) |
@@ -1231,7 +1256,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1231 | e.Message, e.StackTrace); | 1256 | e.Message, e.StackTrace); |
1232 | } | 1257 | } |
1233 | } | 1258 | } |
1234 | } | 1259 | } |
1235 | } | 1260 | } |
1236 | 1261 | ||
1237 | public void TriggerOnIncomingSceneObject(SceneObjectGroup so) | 1262 | public void TriggerOnIncomingSceneObject(SceneObjectGroup so) |
@@ -1251,12 +1276,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1251 | "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing. {0} {1}", | 1276 | "[EVENT MANAGER]: Delegate for TriggerOnIncomingSceneObject failed - continuing. {0} {1}", |
1252 | e.Message, e.StackTrace); | 1277 | e.Message, e.StackTrace); |
1253 | } | 1278 | } |
1254 | } | 1279 | } |
1255 | } | 1280 | } |
1256 | } | 1281 | } |
1257 | 1282 | ||
1258 | public void TriggerOnRegisterCaps(UUID agentID, Caps caps) | 1283 | public void TriggerOnRegisterCaps(UUID agentID, Caps caps) |
1259 | { | 1284 | { |
1260 | RegisterCapsEvent handlerRegisterCaps = OnRegisterCaps; | 1285 | RegisterCapsEvent handlerRegisterCaps = OnRegisterCaps; |
1261 | if (handlerRegisterCaps != null) | 1286 | if (handlerRegisterCaps != null) |
1262 | { | 1287 | { |
@@ -1273,7 +1298,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1273 | e.Message, e.StackTrace); | 1298 | e.Message, e.StackTrace); |
1274 | } | 1299 | } |
1275 | } | 1300 | } |
1276 | } | 1301 | } |
1277 | } | 1302 | } |
1278 | 1303 | ||
1279 | public void TriggerOnDeregisterCaps(UUID agentID, Caps caps) | 1304 | public void TriggerOnDeregisterCaps(UUID agentID, Caps caps) |
@@ -1294,7 +1319,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1294 | e.Message, e.StackTrace); | 1319 | e.Message, e.StackTrace); |
1295 | } | 1320 | } |
1296 | } | 1321 | } |
1297 | } | 1322 | } |
1298 | } | 1323 | } |
1299 | 1324 | ||
1300 | public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, UUID AssetID, String AssetName, int userlevel) | 1325 | public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, UUID AssetID, String AssetName, int userlevel) |
@@ -1315,7 +1340,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1315 | e.Message, e.StackTrace); | 1340 | e.Message, e.StackTrace); |
1316 | } | 1341 | } |
1317 | } | 1342 | } |
1318 | } | 1343 | } |
1319 | } | 1344 | } |
1320 | 1345 | ||
1321 | public void TriggerLandBuy(Object sender, LandBuyArgs args) | 1346 | public void TriggerLandBuy(Object sender, LandBuyArgs args) |
@@ -1336,7 +1361,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1336 | e.Message, e.StackTrace); | 1361 | e.Message, e.StackTrace); |
1337 | } | 1362 | } |
1338 | } | 1363 | } |
1339 | } | 1364 | } |
1340 | } | 1365 | } |
1341 | 1366 | ||
1342 | public void TriggerValidateLandBuy(Object sender, LandBuyArgs args) | 1367 | public void TriggerValidateLandBuy(Object sender, LandBuyArgs args) |
@@ -1357,11 +1382,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1357 | e.Message, e.StackTrace); | 1382 | e.Message, e.StackTrace); |
1358 | } | 1383 | } |
1359 | } | 1384 | } |
1360 | } | 1385 | } |
1361 | } | 1386 | } |
1362 | 1387 | ||
1363 | public void TriggerAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 currentpos) | 1388 | public void TriggerAtTargetEvent(uint localID, uint handle, Vector3 targetpos, Vector3 currentpos) |
1364 | { | 1389 | { |
1365 | ScriptAtTargetEvent handlerScriptAtTargetEvent = OnScriptAtTargetEvent; | 1390 | ScriptAtTargetEvent handlerScriptAtTargetEvent = OnScriptAtTargetEvent; |
1366 | if (handlerScriptAtTargetEvent != null) | 1391 | if (handlerScriptAtTargetEvent != null) |
1367 | { | 1392 | { |
@@ -1378,7 +1403,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1378 | e.Message, e.StackTrace); | 1403 | e.Message, e.StackTrace); |
1379 | } | 1404 | } |
1380 | } | 1405 | } |
1381 | } | 1406 | } |
1382 | } | 1407 | } |
1383 | 1408 | ||
1384 | public void TriggerNotAtTargetEvent(uint localID) | 1409 | public void TriggerNotAtTargetEvent(uint localID) |
@@ -1399,11 +1424,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1399 | e.Message, e.StackTrace); | 1424 | e.Message, e.StackTrace); |
1400 | } | 1425 | } |
1401 | } | 1426 | } |
1402 | } | 1427 | } |
1403 | } | 1428 | } |
1404 | 1429 | ||
1405 | public void TriggerAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion currentrot) | 1430 | public void TriggerAtRotTargetEvent(uint localID, uint handle, Quaternion targetrot, Quaternion currentrot) |
1406 | { | 1431 | { |
1407 | ScriptAtRotTargetEvent handlerScriptAtRotTargetEvent = OnScriptAtRotTargetEvent; | 1432 | ScriptAtRotTargetEvent handlerScriptAtRotTargetEvent = OnScriptAtRotTargetEvent; |
1408 | if (handlerScriptAtRotTargetEvent != null) | 1433 | if (handlerScriptAtRotTargetEvent != null) |
1409 | { | 1434 | { |
@@ -1420,7 +1445,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1420 | e.Message, e.StackTrace); | 1445 | e.Message, e.StackTrace); |
1421 | } | 1446 | } |
1422 | } | 1447 | } |
1423 | } | 1448 | } |
1424 | } | 1449 | } |
1425 | 1450 | ||
1426 | public void TriggerNotAtRotTargetEvent(uint localID) | 1451 | public void TriggerNotAtRotTargetEvent(uint localID) |
@@ -1441,7 +1466,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1441 | e.Message, e.StackTrace); | 1466 | e.Message, e.StackTrace); |
1442 | } | 1467 | } |
1443 | } | 1468 | } |
1444 | } | 1469 | } |
1445 | } | 1470 | } |
1446 | 1471 | ||
1447 | public void TriggerRequestChangeWaterHeight(float height) | 1472 | public void TriggerRequestChangeWaterHeight(float height) |
@@ -1462,7 +1487,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1462 | e.Message, e.StackTrace); | 1487 | e.Message, e.StackTrace); |
1463 | } | 1488 | } |
1464 | } | 1489 | } |
1465 | } | 1490 | } |
1466 | } | 1491 | } |
1467 | 1492 | ||
1468 | public void TriggerAvatarKill(uint KillerObjectLocalID, ScenePresence DeadAvatar) | 1493 | public void TriggerAvatarKill(uint KillerObjectLocalID, ScenePresence DeadAvatar) |
@@ -1483,7 +1508,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1483 | e.Message, e.StackTrace); | 1508 | e.Message, e.StackTrace); |
1484 | } | 1509 | } |
1485 | } | 1510 | } |
1486 | } | 1511 | } |
1487 | } | 1512 | } |
1488 | 1513 | ||
1489 | public void TriggerSignificantClientMovement(IClientAPI client) | 1514 | public void TriggerSignificantClientMovement(IClientAPI client) |
@@ -1504,7 +1529,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1504 | e.Message, e.StackTrace); | 1529 | e.Message, e.StackTrace); |
1505 | } | 1530 | } |
1506 | } | 1531 | } |
1507 | } | 1532 | } |
1508 | } | 1533 | } |
1509 | 1534 | ||
1510 | public void TriggerOnChatFromWorld(Object sender, OSChatMessage chat) | 1535 | public void TriggerOnChatFromWorld(Object sender, OSChatMessage chat) |
@@ -1525,7 +1550,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1525 | e.Message, e.StackTrace); | 1550 | e.Message, e.StackTrace); |
1526 | } | 1551 | } |
1527 | } | 1552 | } |
1528 | } | 1553 | } |
1529 | } | 1554 | } |
1530 | 1555 | ||
1531 | public void TriggerOnChatFromClient(Object sender, OSChatMessage chat) | 1556 | public void TriggerOnChatFromClient(Object sender, OSChatMessage chat) |
@@ -1546,7 +1571,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1546 | e.Message, e.StackTrace); | 1571 | e.Message, e.StackTrace); |
1547 | } | 1572 | } |
1548 | } | 1573 | } |
1549 | } | 1574 | } |
1550 | } | 1575 | } |
1551 | 1576 | ||
1552 | public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) | 1577 | public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) |
@@ -1567,7 +1592,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1567 | e.Message, e.StackTrace); | 1592 | e.Message, e.StackTrace); |
1568 | } | 1593 | } |
1569 | } | 1594 | } |
1570 | } | 1595 | } |
1571 | } | 1596 | } |
1572 | 1597 | ||
1573 | internal void TriggerControlEvent(uint p, UUID scriptUUID, UUID avatarID, uint held, uint _changed) | 1598 | internal void TriggerControlEvent(uint p, UUID scriptUUID, UUID avatarID, uint held, uint _changed) |
@@ -1588,7 +1613,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1588 | e.Message, e.StackTrace); | 1613 | e.Message, e.StackTrace); |
1589 | } | 1614 | } |
1590 | } | 1615 | } |
1591 | } | 1616 | } |
1592 | } | 1617 | } |
1593 | 1618 | ||
1594 | public void TriggerNoticeNoLandDataFromStorage() | 1619 | public void TriggerNoticeNoLandDataFromStorage() |
@@ -1609,7 +1634,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1609 | e.Message, e.StackTrace); | 1634 | e.Message, e.StackTrace); |
1610 | } | 1635 | } |
1611 | } | 1636 | } |
1612 | } | 1637 | } |
1613 | } | 1638 | } |
1614 | 1639 | ||
1615 | public void TriggerIncomingLandDataFromStorage(List<LandData> landData) | 1640 | public void TriggerIncomingLandDataFromStorage(List<LandData> landData) |
@@ -1630,7 +1655,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1630 | e.Message, e.StackTrace); | 1655 | e.Message, e.StackTrace); |
1631 | } | 1656 | } |
1632 | } | 1657 | } |
1633 | } | 1658 | } |
1634 | } | 1659 | } |
1635 | 1660 | ||
1636 | public void TriggerSetAllowForcefulBan(bool allow) | 1661 | public void TriggerSetAllowForcefulBan(bool allow) |
@@ -1651,7 +1676,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1651 | e.Message, e.StackTrace); | 1676 | e.Message, e.StackTrace); |
1652 | } | 1677 | } |
1653 | } | 1678 | } |
1654 | } | 1679 | } |
1655 | } | 1680 | } |
1656 | 1681 | ||
1657 | public void TriggerRequestParcelPrimCountUpdate() | 1682 | public void TriggerRequestParcelPrimCountUpdate() |
@@ -1672,7 +1697,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1672 | e.Message, e.StackTrace); | 1697 | e.Message, e.StackTrace); |
1673 | } | 1698 | } |
1674 | } | 1699 | } |
1675 | } | 1700 | } |
1676 | } | 1701 | } |
1677 | 1702 | ||
1678 | public void TriggerParcelPrimCountTainted() | 1703 | public void TriggerParcelPrimCountTainted() |
@@ -1693,7 +1718,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1693 | e.Message, e.StackTrace); | 1718 | e.Message, e.StackTrace); |
1694 | } | 1719 | } |
1695 | } | 1720 | } |
1696 | } | 1721 | } |
1697 | } | 1722 | } |
1698 | 1723 | ||
1699 | // this lets us keep track of nasty script events like timer, etc. | 1724 | // this lets us keep track of nasty script events like timer, etc. |
@@ -1732,7 +1757,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1732 | e.Message, e.StackTrace); | 1757 | e.Message, e.StackTrace); |
1733 | } | 1758 | } |
1734 | } | 1759 | } |
1735 | } | 1760 | } |
1736 | } | 1761 | } |
1737 | 1762 | ||
1738 | public float GetCurrentTimeAsSunLindenHour() | 1763 | public float GetCurrentTimeAsSunLindenHour() |
@@ -1759,7 +1784,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1759 | } | 1784 | } |
1760 | 1785 | ||
1761 | public void TriggerOarFileLoaded(Guid requestId, string message) | 1786 | public void TriggerOarFileLoaded(Guid requestId, string message) |
1762 | { | 1787 | { |
1763 | OarFileLoaded handlerOarFileLoaded = OnOarFileLoaded; | 1788 | OarFileLoaded handlerOarFileLoaded = OnOarFileLoaded; |
1764 | if (handlerOarFileLoaded != null) | 1789 | if (handlerOarFileLoaded != null) |
1765 | { | 1790 | { |
@@ -1776,7 +1801,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1776 | e.Message, e.StackTrace); | 1801 | e.Message, e.StackTrace); |
1777 | } | 1802 | } |
1778 | } | 1803 | } |
1779 | } | 1804 | } |
1780 | } | 1805 | } |
1781 | 1806 | ||
1782 | public void TriggerOarFileSaved(Guid requestId, string message) | 1807 | public void TriggerOarFileSaved(Guid requestId, string message) |
@@ -1797,7 +1822,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1797 | e.Message, e.StackTrace); | 1822 | e.Message, e.StackTrace); |
1798 | } | 1823 | } |
1799 | } | 1824 | } |
1800 | } | 1825 | } |
1801 | } | 1826 | } |
1802 | 1827 | ||
1803 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) | 1828 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) |
@@ -1818,7 +1843,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1818 | e.Message, e.StackTrace); | 1843 | e.Message, e.StackTrace); |
1819 | } | 1844 | } |
1820 | } | 1845 | } |
1821 | } | 1846 | } |
1822 | } | 1847 | } |
1823 | 1848 | ||
1824 | public void TriggerScriptCollidingStart(uint localId, ColliderArgs colliders) | 1849 | public void TriggerScriptCollidingStart(uint localId, ColliderArgs colliders) |
@@ -1839,7 +1864,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1839 | e.Message, e.StackTrace); | 1864 | e.Message, e.StackTrace); |
1840 | } | 1865 | } |
1841 | } | 1866 | } |
1842 | } | 1867 | } |
1843 | } | 1868 | } |
1844 | 1869 | ||
1845 | public void TriggerScriptColliding(uint localId, ColliderArgs colliders) | 1870 | public void TriggerScriptColliding(uint localId, ColliderArgs colliders) |
@@ -1860,7 +1885,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1860 | e.Message, e.StackTrace); | 1885 | e.Message, e.StackTrace); |
1861 | } | 1886 | } |
1862 | } | 1887 | } |
1863 | } | 1888 | } |
1864 | } | 1889 | } |
1865 | 1890 | ||
1866 | public void TriggerScriptCollidingEnd(uint localId, ColliderArgs colliders) | 1891 | public void TriggerScriptCollidingEnd(uint localId, ColliderArgs colliders) |
@@ -1881,7 +1906,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1881 | e.Message, e.StackTrace); | 1906 | e.Message, e.StackTrace); |
1882 | } | 1907 | } |
1883 | } | 1908 | } |
1884 | } | 1909 | } |
1885 | } | 1910 | } |
1886 | 1911 | ||
1887 | public void TriggerScriptLandCollidingStart(uint localId, ColliderArgs colliders) | 1912 | public void TriggerScriptLandCollidingStart(uint localId, ColliderArgs colliders) |
@@ -1902,7 +1927,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1902 | e.Message, e.StackTrace); | 1927 | e.Message, e.StackTrace); |
1903 | } | 1928 | } |
1904 | } | 1929 | } |
1905 | } | 1930 | } |
1906 | } | 1931 | } |
1907 | 1932 | ||
1908 | public void TriggerScriptLandColliding(uint localId, ColliderArgs colliders) | 1933 | public void TriggerScriptLandColliding(uint localId, ColliderArgs colliders) |
@@ -1923,7 +1948,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1923 | e.Message, e.StackTrace); | 1948 | e.Message, e.StackTrace); |
1924 | } | 1949 | } |
1925 | } | 1950 | } |
1926 | } | 1951 | } |
1927 | } | 1952 | } |
1928 | 1953 | ||
1929 | public void TriggerScriptLandCollidingEnd(uint localId, ColliderArgs colliders) | 1954 | public void TriggerScriptLandCollidingEnd(uint localId, ColliderArgs colliders) |
@@ -1944,11 +1969,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1944 | e.Message, e.StackTrace); | 1969 | e.Message, e.StackTrace); |
1945 | } | 1970 | } |
1946 | } | 1971 | } |
1947 | } | 1972 | } |
1948 | } | 1973 | } |
1949 | 1974 | ||
1950 | public void TriggerSetRootAgentScene(UUID agentID, Scene scene) | 1975 | public void TriggerSetRootAgentScene(UUID agentID, Scene scene) |
1951 | { | 1976 | { |
1952 | OnSetRootAgentSceneDelegate handlerSetRootAgentScene = OnSetRootAgentScene; | 1977 | OnSetRootAgentSceneDelegate handlerSetRootAgentScene = OnSetRootAgentScene; |
1953 | if (handlerSetRootAgentScene != null) | 1978 | if (handlerSetRootAgentScene != null) |
1954 | { | 1979 | { |
@@ -1965,7 +1990,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1965 | e.Message, e.StackTrace); | 1990 | e.Message, e.StackTrace); |
1966 | } | 1991 | } |
1967 | } | 1992 | } |
1968 | } | 1993 | } |
1969 | } | 1994 | } |
1970 | 1995 | ||
1971 | public void TriggerOnRegionUp(GridRegion otherRegion) | 1996 | public void TriggerOnRegionUp(GridRegion otherRegion) |
@@ -1986,7 +2011,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1986 | e.Message, e.StackTrace); | 2011 | e.Message, e.StackTrace); |
1987 | } | 2012 | } |
1988 | } | 2013 | } |
1989 | } | 2014 | } |
1990 | } | 2015 | } |
1991 | } | 2016 | } |
1992 | } | 2017 | } |