diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
| -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 cdd22de..d2824bd 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -6303,8 +6303,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6303 | if (handlerObjectDuplicate != null) | 6303 | if (handlerObjectDuplicate != null) |
| 6304 | { | 6304 | { |
| 6305 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, | 6305 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, |
| 6306 | dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID, | 6306 | dupe.SharedData.DuplicateFlags, AgentId, |
| 6307 | AgentandGroupData.GroupID); | 6307 | m_activeGroupID); |
| 6308 | } | 6308 | } |
| 6309 | } | 6309 | } |
| 6310 | 6310 | ||
| @@ -6894,7 +6894,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 6894 | if (handlerObjectDuplicateOnRay != null) | 6894 | if (handlerObjectDuplicateOnRay != null) |
| 6895 | { | 6895 | { |
| 6896 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, | 6896 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, |
| 6897 | dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, | 6897 | AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, |
| 6898 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, | 6898 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, |
| 6899 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); | 6899 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); |
| 6900 | } | 6900 | } |