2 files changed, 9 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
index a86fceb..62b7e35 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Gestures/GesturesModule.cs
@@ -46,6 +46,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
         public void Initialise(Scene scene, IConfigSource source)
         {
             m_scene = scene;
+            
+            m_scene.EventManager.OnNewClient += OnNewClient;
+            
             m_scene.RegisterModuleInterface<IGesturesModule>(this);
         }
         
@@ -54,6 +57,12 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
         public string Name { get { return "Gestures Module"; } }
         public bool IsSharedModule { get { return false; } }
         
+        private void OnNewClient(IClientAPI client)
+        {
+            client.OnActivateGesture += ActivateGesture;
+            client.OnDeactivateGesture += DeactivateGesture;
+        }
+        
         public virtual void ActivateGesture(IClientAPI client, UUID assetId, UUID gestureId)
         {
             CachedUserInfo userInfo = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index ee27be1..06354cf 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2334,13 +2334,6 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnRegionHandleRequest += RegionHandleRequest;
             client.OnUnackedTerrain += TerrainUnAcked;
 
-            IGesturesModule gesturesModule = RequestModuleInterface<IGesturesModule>();            
-            if (gesturesModule != null)
-            {
-                client.OnActivateGesture += gesturesModule.ActivateGesture;
-                client.OnDeactivateGesture += gesturesModule.DeactivateGesture;
-            }
-
             client.OnObjectOwner += ObjectOwner;
             
             if (m_statsReporter != null)