diff options
| author | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
| commit | b7f5e8284360f92e0e102b9546076573c57d9397 (patch) | |
| tree | 132663da8c1882e524241b55a739ef2758ef8958 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | Merge https://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.zip opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.gz opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.bz2 opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 8d85d1a..7851c4d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -6016,8 +6016,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6016 | SoundTrigger handlerSoundTrigger = OnSoundTrigger; | 6016 | SoundTrigger handlerSoundTrigger = OnSoundTrigger; |
| 6017 | if (handlerSoundTrigger != null) | 6017 | if (handlerSoundTrigger != null) |
| 6018 | { | 6018 | { |
| 6019 | handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, soundTriggerPacket.SoundData.OwnerID, | 6019 | // UUIDS are sent as zeroes by the client, substitute agent's id |
| 6020 | soundTriggerPacket.SoundData.ObjectID, soundTriggerPacket.SoundData.ParentID, | 6020 | handlerSoundTrigger(soundTriggerPacket.SoundData.SoundID, AgentId, |
| 6021 | AgentId, AgentId, | ||
| 6021 | soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position, | 6022 | soundTriggerPacket.SoundData.Gain, soundTriggerPacket.SoundData.Position, |
| 6022 | soundTriggerPacket.SoundData.Handle, 0); | 6023 | soundTriggerPacket.SoundData.Handle, 0); |
| 6023 | 6024 | ||