aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs36
1 files changed, 31 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
255 //Gesture 255 //Gesture
256 private ActivateGesture handlerActivateGesture; 256 private ActivateGesture handlerActivateGesture;
257 private DeactivateGesture handlerDeactivateGesture; 257 private DeactivateGesture handlerDeactivateGesture;
258 //Sound
259 private SoundTrigger handlerSoundTrigger;
258 private ObjectOwner handlerObjectOwner; 260 private ObjectOwner handlerObjectOwner;
259 261
260 private DirPlacesQuery handlerDirPlacesQuery; 262 private DirPlacesQuery handlerDirPlacesQuery;
@@ -981,14 +983,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
981 public event OfferCallingCard OnOfferCallingCard; 983 public event OfferCallingCard OnOfferCallingCard;
982 public event AcceptCallingCard OnAcceptCallingCard; 984 public event AcceptCallingCard OnAcceptCallingCard;
983 public event DeclineCallingCard OnDeclineCallingCard; 985 public event DeclineCallingCard OnDeclineCallingCard;
986 public event SoundTrigger OnSoundTrigger;
984 987
985 // voire si c'est necessaire 988
989
986 public void ActivateGesture(UUID assetId, UUID gestureId) 990 public void ActivateGesture(UUID assetId, UUID gestureId)
987 { 991 {
988 } 992 }
989 public void DeactivateGesture(UUID assetId, UUID gestureId) 993 public void DeactivateGesture(UUID assetId, UUID gestureId)
990 { 994 {
991 } 995 }
996
997 // Sound
998 public void SoundTrigger(UUID soundId, UUID owerid, UUID Objectid,UUID ParentId,float Gain, Vector3 Position,UInt64 Handle)
999 {
1000
1001 }
1002
992 #region Scene/Avatar to Client 1003 #region Scene/Avatar to Client
993 1004
994 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) 1005 public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
@@ -4384,6 +4395,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4384 } 4395 }
4385 } 4396 }
4386 break; 4397 break;
4398 case PacketType.SoundTrigger:
4399 // TODO: handle this packet
4400 // SM 200811
4401 SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack;
4402 handlerSoundTrigger = OnSoundTrigger;
4403 if (handlerSoundTrigger != null)
4404 //UUID ownerID, UUID objectID, UUID parentID
4405 {
4406 handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID,
4407 soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID,
4408 soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position,
4409 soundTriggerPacket.SoundData.Handle);
4410
4411 }
4412 else
4413 m_log.Error("Null pointer for Soundtrigger");
4414 break;
4387 case PacketType.AvatarPickerRequest: 4415 case PacketType.AvatarPickerRequest:
4388 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; 4416 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
4389 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; 4417 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
@@ -6323,13 +6351,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6323 // TODO: handle this packet 6351 // TODO: handle this packet
6324 //m_log.Warn("[CLIENT]: unhandled ObjectSpinStop packet"); 6352 //m_log.Warn("[CLIENT]: unhandled ObjectSpinStop packet");
6325 break; 6353 break;
6326 case PacketType.SoundTrigger: 6354
6327 // TODO: handle this packet
6328 //m_log.Warn("[CLIENT]: unhandled SoundTrigger packet");
6329 break;
6330 case PacketType.InventoryDescendents: 6355 case PacketType.InventoryDescendents:
6331 // TODO: handle this packet 6356 // TODO: handle this packet
6332 //m_log.Warn("[CLIENT]: unhandled InventoryDescent packet"); 6357 //m_log.Warn("[CLIENT]: unhandled InventoryDescent packet");
6358
6333 break; 6359 break;
6334 case PacketType.DirPlacesQuery: 6360 case PacketType.DirPlacesQuery:
6335 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack; 6361 DirPlacesQueryPacket dirPlacesQueryPacket = (DirPlacesQueryPacket)Pack;