OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Omit parcel checks for attachments.

0.6.1-post-fixes
Melanie Thielker 2008-11-28 04:31:39 +00:00
parent 3ff34579e4
commit 0afbb6cb3e
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -2156,14 +2156,11 @@ namespace OpenSim.Region.Environment.Scenes
SceneObjectPart RootPrim = GetSceneObjectPart(primID); SceneObjectPart RootPrim = GetSceneObjectPart(primID);
if (RootPrim != null) if (RootPrim != null)
{ {
if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID) || if (m_regInfo.EstateSettings.IsBanned(RootPrim.OwnerID))
(!Permissions.CanObjectEntry(RootPrim.UUID, true, RootPrim.AbsolutePosition)))
{ {
SceneObjectGroup grp = RootPrim.ParentGroup; SceneObjectGroup grp = RootPrim.ParentGroup;
if (grp != null) if (grp != null)
{
DeleteSceneObject(grp, false); DeleteSceneObject(grp, false);
}
m_log.Info("[INTERREGION]: Denied prim crossing for banned avatar"); m_log.Info("[INTERREGION]: Denied prim crossing for banned avatar");
@ -2172,6 +2169,19 @@ namespace OpenSim.Region.Environment.Scenes
if (RootPrim.Shape.PCode == (byte)PCode.Prim) if (RootPrim.Shape.PCode == (byte)PCode.Prim)
{ {
SceneObjectGroup grp = RootPrim.ParentGroup; SceneObjectGroup grp = RootPrim.ParentGroup;
if((RootPrim.Shape.State == 0) &&
(!Permissions.CanObjectEntry(RootPrim.UUID,
true, RootPrim.AbsolutePosition)))
{
if (grp != null)
{
DeleteSceneObject(grp, false);
}
m_log.Info("[INTERREGION]: Denied prim crossing because of parcel settings");
return false;
}
if (grp != null) if (grp != null)
{ {
if (RootPrim.Shape.State != 0) if (RootPrim.Shape.State != 0)