diff options
author | Melanie Thielker | 2010-06-28 01:29:30 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-06-28 01:29:30 +0200 |
commit | d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2 (patch) | |
tree | 3e56a7643960d7057780d490c593315733ae1896 /OpenSim/Region/ClientStack/LindenUDP | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC_OLD-d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2.zip opensim-SC_OLD-d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2.tar.gz opensim-SC_OLD-d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2.tar.bz2 opensim-SC_OLD-d570cffa39e9ca6417ebd1c05cbdfea1d3beabd2.tar.xz |
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-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 f071841..cf1dda9 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -6307,8 +6307,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6307 | if (handlerObjectDuplicate != null) | 6307 | if (handlerObjectDuplicate != null) |
6308 | { | 6308 | { |
6309 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, | 6309 | handlerObjectDuplicate(dupe.ObjectData[i].ObjectLocalID, dupe.SharedData.Offset, |
6310 | dupe.SharedData.DuplicateFlags, AgentandGroupData.AgentID, | 6310 | dupe.SharedData.DuplicateFlags, AgentId, |
6311 | AgentandGroupData.GroupID); | 6311 | m_activeGroupID); |
6312 | } | 6312 | } |
6313 | } | 6313 | } |
6314 | 6314 | ||
@@ -6898,7 +6898,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
6898 | if (handlerObjectDuplicateOnRay != null) | 6898 | if (handlerObjectDuplicateOnRay != null) |
6899 | { | 6899 | { |
6900 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, | 6900 | handlerObjectDuplicateOnRay(dupeOnRay.ObjectData[i].ObjectLocalID, dupeOnRay.AgentData.DuplicateFlags, |
6901 | dupeOnRay.AgentData.AgentID, dupeOnRay.AgentData.GroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, | 6901 | AgentId, m_activeGroupID, dupeOnRay.AgentData.RayTargetID, dupeOnRay.AgentData.RayEnd, |
6902 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, | 6902 | dupeOnRay.AgentData.RayStart, dupeOnRay.AgentData.BypassRaycast, dupeOnRay.AgentData.RayEndIsIntersection, |
6903 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); | 6903 | dupeOnRay.AgentData.CopyCenters, dupeOnRay.AgentData.CopyRotates); |
6904 | } | 6904 | } |