ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not allow estate bans to grid admins

Browse Source
This commit is contained in:
UbitUmarov
2025-04-17 15:50:08 +01:00
parent 98703ff3a2
commit b00df07563
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@@ -2769,11 +2769,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// If the user is banned, we won't let any of their objects
// enter. Period.
if (m_sceneRegionInfo.EstateSettings.IsBanned(so.OwnerID))
if (!m_scene.Permissions.IsAdministrator(so.OwnerID) && m_sceneRegionInfo.EstateSettings.IsBanned(so.OwnerID))
{
m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Denied {0} {1} into {2} of banned owner {3}",
so.Name, so.UUID, m_sceneName, so.OwnerID);
m_log.Debug(
$"[ENTITY TRANSFER MODULE]: Denied {so.Name} {so.UUID} into { m_sceneName} of banned owner {so.OwnerID}");
return false;
}
@@ -2781,9 +2780,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
if(m_scene.GetScenePresence(so.OwnerID) == null)
{
m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Denied attachment {0}({1}) owner {2} not in region {3}",
so.Name, so.UUID, so.OwnerID, m_sceneName);
m_log.Debug(
$"[ENTITY TRANSFER MODULE]: Denied attachment {so.Name}({so.UUID}) owner {so.OwnerID} not in region {m_sceneName}");
return false;
}
}