diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 9c29c44..723f874 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
293 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; | 293 | m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor; |
294 | 294 | ||
295 | m_eventManager = new EventManager(); | 295 | m_eventManager = new EventManager(); |
296 | m_externalChecks = new SceneExternalChecks(this); | 296 | m_permissions = new ScenePermissions(this); |
297 | 297 | ||
298 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); | 298 | m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this); |
299 | m_asyncSceneObjectDeleter.Enabled = true; | 299 | m_asyncSceneObjectDeleter.Enabled = true; |
@@ -1750,7 +1750,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1750 | { | 1750 | { |
1751 | Vector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new Vector3(0.5f, 0.5f, 0.5f), false); | 1751 | Vector3 pos = GetNewRezLocation(RayStart, RayEnd, RayTargetID, rot, bypassRaycast, RayEndIsIntersection, true, new Vector3(0.5f, 0.5f, 0.5f), false); |
1752 | 1752 | ||
1753 | if (ExternalChecks.ExternalChecksCanRezObject(1, ownerID, pos)) | 1753 | if (Permissions.CanRezObject(1, ownerID, pos)) |
1754 | { | 1754 | { |
1755 | // rez ON the ground, not IN the ground | 1755 | // rez ON the ground, not IN the ground |
1756 | pos.Z += 0.25F; | 1756 | pos.Z += 0.25F; |
@@ -3450,7 +3450,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3450 | } | 3450 | } |
3451 | 3451 | ||
3452 | // First check that this is the sim owner | 3452 | // First check that this is the sim owner |
3453 | if (ExternalChecks.ExternalChecksCanBeGodLike(agentID)) | 3453 | if (Permissions.IsGod(agentID)) |
3454 | { | 3454 | { |
3455 | // Next we check for spoofing..... | 3455 | // Next we check for spoofing..... |
3456 | UUID testSessionID = m_scenePresences[agentID].ControllingClient.SessionId; | 3456 | UUID testSessionID = m_scenePresences[agentID].ControllingClient.SessionId; |
@@ -3527,7 +3527,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3527 | { | 3527 | { |
3528 | if (m_scenePresences.ContainsKey(agentID) || agentID == kickUserID) | 3528 | if (m_scenePresences.ContainsKey(agentID) || agentID == kickUserID) |
3529 | { | 3529 | { |
3530 | if (ExternalChecks.ExternalChecksCanBeGodLike(godID)) | 3530 | if (Permissions.IsGod(godID)) |
3531 | { | 3531 | { |
3532 | if (agentID == kickUserID) | 3532 | if (agentID == kickUserID) |
3533 | { | 3533 | { |
@@ -3848,7 +3848,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3848 | } | 3848 | } |
3849 | else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) | 3849 | else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) |
3850 | { | 3850 | { |
3851 | if (part.OwnerID == parcel.landData.OwnerID || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) || ExternalChecks.ExternalChecksCanBeGodLike(part.OwnerID)) | 3851 | if (part.OwnerID == parcel.landData.OwnerID || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) || Permissions.IsGod(part.OwnerID)) |
3852 | { | 3852 | { |
3853 | return true; | 3853 | return true; |
3854 | } | 3854 | } |
@@ -4273,7 +4273,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
4273 | List<SceneObjectPart> partList = | 4273 | List<SceneObjectPart> partList = |
4274 | new List<SceneObjectPart>(group.Children.Values); | 4274 | new List<SceneObjectPart>(group.Children.Values); |
4275 | 4275 | ||
4276 | if (ExternalChecks.ExternalChecksPropagatePermissions()) | 4276 | if (Permissions.PropagatePermissions()) |
4277 | { | 4277 | { |
4278 | foreach (SceneObjectPart child in partList) | 4278 | foreach (SceneObjectPart child in partList) |
4279 | { | 4279 | { |