ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

just give up on Export flag, seems just broken no matter water with current FS and singu 1.8.7

Browse Source
This commit is contained in:
UbitUmarov
2016-12-18 03:20:41 +00:00
parent c93551d8f4
commit df7435a703
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -433,7 +433,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export);
// If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export
if (item.CreatorIdAsUuid != item.Owner &&
if (item.CreatorIdAsUuid != item.Owner ||
((item.BasePermissions & permALLandExport) != permALLandExport ||
(item.CurrentPermissions & (uint)PermissionMask.Export) == 0))
denyExportChange = true;
@@ -451,10 +451,12 @@ namespace OpenSim.Region.Framework.Scenes
{
itemUpd.NextPermissions = (uint)(PermissionMask.All);
itemUpd.EveryOnePermissions |= (uint)PermissionMask.Export;
sendUpdate = true;
}
else
{
itemUpd.EveryOnePermissions &= ~(uint)PermissionMask.Export;
sendUpdate = true;
}
}
else
@@ -464,6 +466,7 @@ namespace OpenSim.Region.Framework.Scenes
{
// m_log.DebugFormat("[XXX]: Force full perm");
itemUpd.NextPermissions = (uint)(PermissionMask.All);
sendUpdate = true;
}
}