diff options
author | Melanie Thielker | 2008-11-28 04:31:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-28 04:31:39 +0000 |
commit | 0afbb6cb3e99aea6291cf715c88e8187d641b964 (patch) | |
tree | 6af8bc4a04383b3332f3556e6ec1a3a9eb293a98 /OpenSim | |
parent | Force regioncrossed prims to get a new LocalID. Reset parent local ID to new (diff) | |
download | opensim-SC-0afbb6cb3e99aea6291cf715c88e8187d641b964.zip opensim-SC-0afbb6cb3e99aea6291cf715c88e8187d641b964.tar.gz opensim-SC-0afbb6cb3e99aea6291cf715c88e8187d641b964.tar.bz2 opensim-SC-0afbb6cb3e99aea6291cf715c88e8187d641b964.tar.xz |
Omit parcel checks for attachments.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 29f1302..ec08635 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2156,14 +2156,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
2156 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); | 2156 | SceneObjectPart RootPrim = GetSceneObjectPart(primID); |
2157 | if (RootPrim != null) | 2157 | if (RootPrim != null) |
2158 | { | 2158 | { |
2159 | if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID) || | 2159 | if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID)) |
2160 | (!Permissions.CanObjectEntry(RootPrim.UUID, true, RootPrim.AbsolutePosition))) | ||
2161 | { | 2160 | { |
2162 | SceneObjectGroup grp = RootPrim.ParentGroup; | 2161 | SceneObjectGroup grp = RootPrim.ParentGroup; |
2163 | if (grp != null) | 2162 | if (grp != null) |
2164 | { | ||
2165 | DeleteSceneObject(grp, false); | 2163 | DeleteSceneObject(grp, false); |
2166 | } | ||
2167 | 2164 | ||
2168 | m_log.Info("[INTERREGION]: Denied prim crossing for banned avatar"); | 2165 | m_log.Info("[INTERREGION]: Denied prim crossing for banned avatar"); |
2169 | 2166 | ||
@@ -2172,6 +2169,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
2172 | if (RootPrim.Shape.PCode == (byte)PCode.Prim) | 2169 | if (RootPrim.Shape.PCode == (byte)PCode.Prim) |
2173 | { | 2170 | { |
2174 | SceneObjectGroup grp = RootPrim.ParentGroup; | 2171 | SceneObjectGroup grp = RootPrim.ParentGroup; |
2172 | if((RootPrim.Shape.State == 0) && | ||
2173 | (!Permissions.CanObjectEntry(RootPrim.UUID, | ||
2174 | true, RootPrim.AbsolutePosition))) | ||
2175 | { | ||
2176 | if (grp != null) | ||
2177 | { | ||
2178 | DeleteSceneObject(grp, false); | ||
2179 | } | ||
2180 | |||
2181 | m_log.Info("[INTERREGION]: Denied prim crossing because of parcel settings"); | ||
2182 | |||
2183 | return false; | ||
2184 | } | ||
2175 | if (grp != null) | 2185 | if (grp != null) |
2176 | { | 2186 | { |
2177 | if (RootPrim.Shape.State != 0) | 2187 | if (RootPrim.Shape.State != 0) |