aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-12-23 17:54:13 +0000
committerJustin Clarke Casey2008-12-23 17:54:13 +0000
commitcce1b096dbd8aba46c405b7654d67d3ba96de33a (patch)
treeae8208af8343d8d82df1343038855e1d3c91eba0 /OpenSim/Region/ClientStack/LindenUDP
parent* Add a method to allow friendship offers to a logged in client from an offli... (diff)
downloadopensim-SC_OLD-cce1b096dbd8aba46c405b7654d67d3ba96de33a.zip
opensim-SC_OLD-cce1b096dbd8aba46c405b7654d67d3ba96de33a.tar.gz
opensim-SC_OLD-cce1b096dbd8aba46c405b7654d67d3ba96de33a.tar.bz2
opensim-SC_OLD-cce1b096dbd8aba46c405b7654d67d3ba96de33a.tar.xz
* refactor: Replace part of SceneObjectPart with the identical sound playing code in the SoundModule
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs9
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9d8ecf0..8922364 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4597,6 +4597,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4597 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 4597 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
4598 } 4598 }
4599 break; 4599 break;
4600
4600 case PacketType.AgentSit: 4601 case PacketType.AgentSit:
4601 if (OnAgentSit != null) 4602 if (OnAgentSit != null)
4602 { 4603 {
@@ -4609,13 +4610,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4609 } 4610 }
4610 } 4611 }
4611 break; 4612 break;
4613
4612 case PacketType.SoundTrigger: 4614 case PacketType.SoundTrigger:
4613 // TODO: handle this packet
4614 // SM 200811
4615 SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack; 4615 SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack;
4616 handlerSoundTrigger = OnSoundTrigger; 4616 handlerSoundTrigger = OnSoundTrigger;
4617 if (handlerSoundTrigger != null) 4617 if (handlerSoundTrigger != null)
4618 //UUID ownerID, UUID objectID, UUID parentID
4619 { 4618 {
4620 handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID, 4619 handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID,
4621 soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID, 4620 soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID,
@@ -4623,9 +4622,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4623 soundTriggerPacket.SoundData.Handle); 4622 soundTriggerPacket.SoundData.Handle);
4624 4623
4625 } 4624 }
4626 else
4627 m_log.Error("Null pointer for Soundtrigger");
4628 break; 4625 break;
4626
4629 case PacketType.AvatarPickerRequest: 4627 case PacketType.AvatarPickerRequest:
4630 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack; 4628 AvatarPickerRequestPacket avRequestQuery = (AvatarPickerRequestPacket)Pack;
4631 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData; 4629 AvatarPickerRequestPacket.AgentDataBlock Requestdata = avRequestQuery.AgentData;
@@ -4639,6 +4637,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4639 Utils.BytesToString(querydata.Name)); 4637 Utils.BytesToString(querydata.Name));
4640 } 4638 }
4641 break; 4639 break;
4640
4642 case PacketType.AgentDataUpdateRequest: 4641 case PacketType.AgentDataUpdateRequest:
4643 AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack; 4642 AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack;
4644 4643