4 files changed, 52 insertions, 5 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3265817..25927b6 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -255,6 +255,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //Gesture
         private ActivateGesture handlerActivateGesture;
         private DeactivateGesture handlerDeactivateGesture;
+        //Sound
+        private SoundTrigger handlerSoundTrigger;
         private ObjectOwner handlerObjectOwner;
 
         private DirPlacesQuery handlerDirPlacesQuery;
@@ -981,14 +983,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event OfferCallingCard OnOfferCallingCard;
         public event AcceptCallingCard OnAcceptCallingCard;
         public event DeclineCallingCard OnDeclineCallingCard;
+        public event SoundTrigger OnSoundTrigger;
 
-        // voire si c'est necessaire
+
+        
         public void ActivateGesture(UUID assetId, UUID gestureId)
         {
         }
         public void DeactivateGesture(UUID assetId, UUID gestureId)
         {
         }
+
+        // Sound
+        public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid,UUID ParentId,float Gain, Vector3 Position,UInt64 Handle)
+        {
+           
+        }
+
         #region Scene/Avatar to Client
 
         public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
@@ -4384,6 +4395,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
                     break;
+                case PacketType.SoundTrigger:
+                    // TODO: handle this packet
+                    // SM 200811
+                    SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack;
+                    handlerSoundTrigger = OnSoundTrigger;
+                    if (handlerSoundTrigger != null)
+                    //UUID ownerID, UUID objectID, UUID parentID
+                    {
+                        handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID,
+                            soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID,
+                            soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position,
+                            soundTriggerPacket.SoundData.Handle);
+
+                    }
+                    else
+                        m_log.Error("Null pointer for Soundtrigger");
+                    break;
                 case PacketType.AvatarPickerRequest:
                     AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
                     AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
@@ -6323,13 +6351,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // TODO: handle this packet
                     //m_log.Warn("[CLIENT]: unhandled ObjectSpinStop packet");
                     break;
-                case PacketType.SoundTrigger:
-                    // TODO: handle this packet
-                    //m_log.Warn("[CLIENT]: unhandled SoundTrigger packet");
-                    break;
+                
                 case PacketType.InventoryDescendents:
                     // TODO: handle this packet
                     //m_log.Warn("[CLIENT]: unhandled InventoryDescent packet");
+                    
                     break;
                 case PacketType.DirPlacesQuery:
                     DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack;
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 3af947f..f243987 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -340,6 +340,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
         public event OfferCallingCard OnOfferCallingCard;
         public event AcceptCallingCard OnAcceptCallingCard;
         public event DeclineCallingCard OnDeclineCallingCard;
+        public event SoundTrigger OnSoundTrigger;
 
 
 #pragma warning restore 67
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7ea4686..a9014e1 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2342,12 +2342,31 @@ namespace OpenSim.Region.Environment.Scenes
             //Gesture
             client.OnActivateGesture += ActivateGesture;
             client.OnDeactivateGesture += DeactivateGesture;
+            //sound
+            client.OnSoundTrigger += SoundTrigger;
 
             client.OnObjectOwner += ObjectOwner;
 
             // EventManager.TriggerOnNewClient(client);
         }
 
+        // Sound
+        public virtual void SoundTrigger( UUID soundId, UUID ownerID, UUID objectID, UUID parentID,
+                                                float gain, Vector3 position, UInt64 handle)
+        {
+            foreach (ScenePresence p in GetAvatars())
+            {
+                double dis = Util.GetDistanceTo(p.AbsolutePosition, position);
+                if (dis > 100.0) // Max audio distance
+                    continue;
+
+                // Scale by distance          
+                gain = (float)((double)gain*((100.0 - dis) / 100.0));
+                p.ControllingClient.SendTriggeredSound(soundId, ownerID, objectID, parentID, handle, position, (float)gain);
+            }
+            
+        }
+
         // Gesture
         public virtual void ActivateGesture(IClientAPI client,  UUID assetId, UUID gestureId)
         {
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index d523298..e05ccd1 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -235,6 +235,7 @@ namespace OpenSim.Region.Examples.SimpleModule
         public event OfferCallingCard OnOfferCallingCard;
         public event AcceptCallingCard OnAcceptCallingCard;
         public event DeclineCallingCard OnDeclineCallingCard;
+        public event SoundTrigger OnSoundTrigger;
 
 
 #pragma warning restore 67