diff options
author | Justin Clark-Casey (justincc) | 2010-07-30 21:41:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-07-30 21:41:44 +0100 |
commit | 424b4b2b8663f0f6780d2d3a2656e5b298418711 (patch) | |
tree | f608b701dc73df59161a0585a65c297b9c069bc4 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | remove unused BasicQuadTreeNode (diff) | |
download | opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.zip opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.gz opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.bz2 opensim-SC_OLD-424b4b2b8663f0f6780d2d3a2656e5b298418711.tar.xz |
move attachment subscription events into AttachmentsModule from scene.
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9141d44..088d210 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2783,17 +2783,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2783 | SubscribeToClientPrimEvents(client); | 2783 | SubscribeToClientPrimEvents(client); |
2784 | SubscribeToClientPrimRezEvents(client); | 2784 | SubscribeToClientPrimRezEvents(client); |
2785 | SubscribeToClientInventoryEvents(client); | 2785 | SubscribeToClientInventoryEvents(client); |
2786 | SubscribeToClientAttachmentEvents(client); | ||
2787 | SubscribeToClientTeleportEvents(client); | 2786 | SubscribeToClientTeleportEvents(client); |
2788 | SubscribeToClientScriptEvents(client); | 2787 | SubscribeToClientScriptEvents(client); |
2789 | SubscribeToClientParcelEvents(client); | 2788 | SubscribeToClientParcelEvents(client); |
2790 | SubscribeToClientGridEvents(client); | 2789 | SubscribeToClientGridEvents(client); |
2791 | SubscribeToClientGodEvents(client); | 2790 | SubscribeToClientGodEvents(client); |
2792 | |||
2793 | SubscribeToClientNetworkEvents(client); | 2791 | SubscribeToClientNetworkEvents(client); |
2794 | |||
2795 | |||
2796 | // EventManager.TriggerOnNewClient(client); | ||
2797 | } | 2792 | } |
2798 | 2793 | ||
2799 | public virtual void SubscribeToClientTerrainEvents(IClientAPI client) | 2794 | public virtual void SubscribeToClientTerrainEvents(IClientAPI client) |
@@ -2874,18 +2869,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2874 | client.OnMoveTaskItem += ClientMoveTaskInventoryItem; | 2869 | client.OnMoveTaskItem += ClientMoveTaskInventoryItem; |
2875 | } | 2870 | } |
2876 | 2871 | ||
2877 | public virtual void SubscribeToClientAttachmentEvents(IClientAPI client) | ||
2878 | { | ||
2879 | if (AttachmentsModule != null) | ||
2880 | { | ||
2881 | client.OnRezSingleAttachmentFromInv += AttachmentsModule.RezSingleAttachmentFromInventory; | ||
2882 | client.OnRezMultipleAttachmentsFromInv += AttachmentsModule.RezMultipleAttachmentsFromInventory; | ||
2883 | client.OnObjectAttach += AttachmentsModule.AttachObject; | ||
2884 | client.OnObjectDetach += AttachmentsModule.DetachObject; | ||
2885 | client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory; | ||
2886 | } | ||
2887 | } | ||
2888 | |||
2889 | public virtual void SubscribeToClientTeleportEvents(IClientAPI client) | 2872 | public virtual void SubscribeToClientTeleportEvents(IClientAPI client) |
2890 | { | 2873 | { |
2891 | client.OnTeleportLocationRequest += RequestTeleportLocation; | 2874 | client.OnTeleportLocationRequest += RequestTeleportLocation; |
@@ -2934,16 +2917,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2934 | } | 2917 | } |
2935 | 2918 | ||
2936 | /// <summary> | 2919 | /// <summary> |
2937 | /// Register for events from the client | 2920 | /// Unsubscribe the client from events. |
2938 | /// </summary> | 2921 | /// </summary> |
2939 | /// <param name="client">The IClientAPI of the connected client</param> | 2922 | /// <param name="client">The IClientAPI of the client</param> |
2940 | public virtual void UnSubscribeToClientEvents(IClientAPI client) | 2923 | public virtual void UnSubscribeToClientEvents(IClientAPI client) |
2941 | { | 2924 | { |
2942 | UnSubscribeToClientTerrainEvents(client); | 2925 | UnSubscribeToClientTerrainEvents(client); |
2943 | UnSubscribeToClientPrimEvents(client); | 2926 | UnSubscribeToClientPrimEvents(client); |
2944 | UnSubscribeToClientPrimRezEvents(client); | 2927 | UnSubscribeToClientPrimRezEvents(client); |
2945 | UnSubscribeToClientInventoryEvents(client); | 2928 | UnSubscribeToClientInventoryEvents(client); |
2946 | UnSubscribeToClientAttachmentEvents(client); | ||
2947 | UnSubscribeToClientTeleportEvents(client); | 2929 | UnSubscribeToClientTeleportEvents(client); |
2948 | UnSubscribeToClientScriptEvents(client); | 2930 | UnSubscribeToClientScriptEvents(client); |
2949 | UnSubscribeToClientParcelEvents(client); | 2931 | UnSubscribeToClientParcelEvents(client); |
@@ -2951,8 +2933,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2951 | UnSubscribeToClientGodEvents(client); | 2933 | UnSubscribeToClientGodEvents(client); |
2952 | 2934 | ||
2953 | UnSubscribeToClientNetworkEvents(client); | 2935 | UnSubscribeToClientNetworkEvents(client); |
2954 | |||
2955 | // EventManager.TriggerOnNewClient(client); | ||
2956 | } | 2936 | } |
2957 | 2937 | ||
2958 | public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client) | 2938 | public virtual void UnSubscribeToClientTerrainEvents(IClientAPI client) |
@@ -3029,18 +3009,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3029 | client.OnMoveTaskItem -= ClientMoveTaskInventoryItem; | 3009 | client.OnMoveTaskItem -= ClientMoveTaskInventoryItem; |
3030 | } | 3010 | } |
3031 | 3011 | ||
3032 | public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client) | ||
3033 | { | ||
3034 | if (AttachmentsModule != null) | ||
3035 | { | ||
3036 | client.OnRezSingleAttachmentFromInv -= AttachmentsModule.RezSingleAttachmentFromInventory; | ||
3037 | client.OnRezMultipleAttachmentsFromInv -= AttachmentsModule.RezMultipleAttachmentsFromInventory; | ||
3038 | client.OnObjectAttach -= AttachmentsModule.AttachObject; | ||
3039 | client.OnObjectDetach -= AttachmentsModule.DetachObject; | ||
3040 | client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory; | ||
3041 | } | ||
3042 | } | ||
3043 | |||
3044 | public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client) | 3012 | public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client) |
3045 | { | 3013 | { |
3046 | client.OnTeleportLocationRequest -= RequestTeleportLocation; | 3014 | client.OnTeleportLocationRequest -= RequestTeleportLocation; |