aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs25
1 files changed, 4 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 61817f2..83489e8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2787,7 +2787,6 @@ namespace OpenSim.Region.Framework.Scenes
2787 SubscribeToClientScriptEvents(client); 2787 SubscribeToClientScriptEvents(client);
2788 SubscribeToClientParcelEvents(client); 2788 SubscribeToClientParcelEvents(client);
2789 SubscribeToClientGridEvents(client); 2789 SubscribeToClientGridEvents(client);
2790 SubscribeToClientGodEvents(client);
2791 SubscribeToClientNetworkEvents(client); 2790 SubscribeToClientNetworkEvents(client);
2792 } 2791 }
2793 2792
@@ -2798,8 +2797,7 @@ namespace OpenSim.Region.Framework.Scenes
2798 } 2797 }
2799 2798
2800 public virtual void SubscribeToClientPrimEvents(IClientAPI client) 2799 public virtual void SubscribeToClientPrimEvents(IClientAPI client)
2801 { 2800 {
2802
2803 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; 2801 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition;
2804 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; 2802 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
2805 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation; 2803 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation;
@@ -2898,14 +2896,7 @@ namespace OpenSim.Region.Framework.Scenes
2898 client.OnSetStartLocationRequest += SetHomeRezPoint; 2896 client.OnSetStartLocationRequest += SetHomeRezPoint;
2899 client.OnRegionHandleRequest += RegionHandleRequest; 2897 client.OnRegionHandleRequest += RegionHandleRequest;
2900 } 2898 }
2901 2899
2902 public virtual void SubscribeToClientGodEvents(IClientAPI client)
2903 {
2904 IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
2905 client.OnGodKickUser += godsModule.KickUser;
2906 client.OnRequestGodlikePowers += godsModule.RequestGodlikePowers;
2907 }
2908
2909 public virtual void SubscribeToClientNetworkEvents(IClientAPI client) 2900 public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
2910 { 2901 {
2911 client.OnNetworkStatsUpdate += StatsReporter.AddPacketsStats; 2902 client.OnNetworkStatsUpdate += StatsReporter.AddPacketsStats;
@@ -2915,6 +2906,7 @@ namespace OpenSim.Region.Framework.Scenes
2915 /// <summary> 2906 /// <summary>
2916 /// Unsubscribe the client from events. 2907 /// Unsubscribe the client from events.
2917 /// </summary> 2908 /// </summary>
2909 /// FIXME: Not called anywhere!
2918 /// <param name="client">The IClientAPI of the client</param> 2910 /// <param name="client">The IClientAPI of the client</param>
2919 public virtual void UnSubscribeToClientEvents(IClientAPI client) 2911 public virtual void UnSubscribeToClientEvents(IClientAPI client)
2920 { 2912 {
@@ -2926,8 +2918,6 @@ namespace OpenSim.Region.Framework.Scenes
2926 UnSubscribeToClientScriptEvents(client); 2918 UnSubscribeToClientScriptEvents(client);
2927 UnSubscribeToClientParcelEvents(client); 2919 UnSubscribeToClientParcelEvents(client);
2928 UnSubscribeToClientGridEvents(client); 2920 UnSubscribeToClientGridEvents(client);
2929 UnSubscribeToClientGodEvents(client);
2930
2931 UnSubscribeToClientNetworkEvents(client); 2921 UnSubscribeToClientNetworkEvents(client);
2932 } 2922 }
2933 2923
@@ -3036,13 +3026,6 @@ namespace OpenSim.Region.Framework.Scenes
3036 client.OnRegionHandleRequest -= RegionHandleRequest; 3026 client.OnRegionHandleRequest -= RegionHandleRequest;
3037 } 3027 }
3038 3028
3039 public virtual void UnSubscribeToClientGodEvents(IClientAPI client)
3040 {
3041 IGodsModule godsModule = RequestModuleInterface<IGodsModule>();
3042 client.OnGodKickUser -= godsModule.KickUser;
3043 client.OnRequestGodlikePowers -= godsModule.RequestGodlikePowers;
3044 }
3045
3046 public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client) 3029 public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
3047 { 3030 {
3048 client.OnNetworkStatsUpdate -= StatsReporter.AddPacketsStats; 3031 client.OnNetworkStatsUpdate -= StatsReporter.AddPacketsStats;
@@ -5256,4 +5239,4 @@ namespace OpenSim.Region.Framework.Scenes
5256 return offsets.ToArray(); 5239 return offsets.ToArray();
5257 } 5240 }
5258 } 5241 }
5259} 5242} \ No newline at end of file