diff options
| author | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
|---|---|---|
| committer | Tom Grimshaw | 2010-06-27 22:23:08 -0700 |
| commit | 7807d118073fc3e82272e27eba8268d24e2a1f5d (patch) | |
| tree | d97d0a899f22d1707e38f96f61a0d40a9e7c4ace /OpenSim/Region/ClientStack | |
| parent | Fix the sound issue. It was caused by missing assets; once the client has mad... (diff) | |
| parent | Change the way IRegionModule us referenced by IEmailModule to (diff) | |
| download | opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.zip opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.gz opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.bz2 opensim-SC-7807d118073fc3e82272e27eba8268d24e2a1f5d.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 5b5dc1e..14b716b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -6316,8 +6316,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6316 | if (handlerObjectDuplicate != null) | 6316 | if (handlerObjectDuplicate != null) |
| 6317 | { | 6317 | { |
| 6318 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, | 6318 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, |
| 6319 | dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID, | 6319 | dupe.SharedData.DuplicateFlags, AgentId, |
| 6320 | AgentandGroupData.GroupID); | 6320 | m_activeGroupID); |
| 6321 | } | 6321 | } |
| 6322 | } | 6322 | } |
| 6323 | 6323 | ||
| @@ -6907,7 +6907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6907 | if (handlerObjectDuplicateOnRay != null) | 6907 | if (handlerObjectDuplicateOnRay != null) |
| 6908 | { | 6908 | { |
| 6909 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, | 6909 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, |
| 6910 | dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, | 6910 | AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, |
| 6911 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, | 6911 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, |
| 6912 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); | 6912 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); |
| 6913 | } | 6913 | } |