Merge branch 'master' into careminster

author: Melanie 2012-06-14 00:57:05 +0100
committer: Melanie 2012-06-14 00:57:05 +0100
commit: 36117e079aa8b149b3764d0beb853251ff77ca09 (patch)
tree: 244337e3da7bf5a65c3eaf1396d2a0a8f0d60ef5 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parent: Merge branch 'master' into careminster (diff)
parent: Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p... (diff)
download: opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.zip
opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.gz
opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.bz2
opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.xz
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 61ef827..c1fe6a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3125,8 +3125,9 @@ namespace OpenSim.Region.Framework.Scenes
            if (ParentGroup.IsDeleted)
                return;
-            if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) &&
+            if (ParentGroup.IsAttachment
-                (ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))
+                && ParentGroup.AttachedAvatar != remoteClient.AgentId
+                && ParentGroup.HasPrivateAttachmentPoint)
                return;
            if (remoteClient.AgentId == OwnerID)
author	Melanie	2012-06-14 00:57:05 +0100
committer	Melanie	2012-06-14 00:57:05 +0100
commit	36117e079aa8b149b3764d0beb853251ff77ca09 (patch)
tree	244337e3da7bf5a65c3eaf1396d2a0a8f0d60ef5 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parent	Merge branch 'master' into careminster (diff)
parent	Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p... (diff)
download	opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.zip opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.gz opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.bz2 opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.xz

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 61ef827..c1fe6a3 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3125,8 +3125,9 @@ namespace OpenSim.Region.Framework.Scenes
3125	if (ParentGroup.IsDeleted)	3125	if (ParentGroup.IsDeleted)
3126	return;	3126	return;
3127		3127
3128	if (ParentGroup.IsAttachment && (ParentGroup.AttachedAvatar != remoteClient.AgentId) &&	3128	if (ParentGroup.IsAttachment
3129	(ParentGroup.AttachmentPoint >= 31) && (ParentGroup.AttachmentPoint <= 38))	3129	&& ParentGroup.AttachedAvatar != remoteClient.AgentId
		3130	&& ParentGroup.HasPrivateAttachmentPoint)
3130	return;	3131	return;
3131		3132
3132	if (remoteClient.AgentId == OwnerID)	3133	if (remoteClient.AgentId == OwnerID)