diff options
author | Justin Clark-Casey (justincc) | 2013-05-14 19:44:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-05-14 19:44:41 +0100 |
commit | e9847a4dbd5657c16b11835301167a98e7ca7e55 (patch) | |
tree | efd1ae15ce1b7a5068ebdcf55c474c5994f48cca /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-e9847a4dbd5657c16b11835301167a98e7ca7e55.zip opensim-SC_OLD-e9847a4dbd5657c16b11835301167a98e7ca7e55.tar.gz opensim-SC_OLD-e9847a4dbd5657c16b11835301167a98e7ca7e55.tar.bz2 opensim-SC_OLD-e9847a4dbd5657c16b11835301167a98e7ca7e55.tar.xz |
Comment out some debugging item permission messages since these are highly noisy on the console.
Please re-enable when required
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 80581dc..6c79b13 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -422,13 +422,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
422 | // is not allowed to change the export flag. | 422 | // is not allowed to change the export flag. |
423 | bool denyExportChange = false; | 423 | bool denyExportChange = false; |
424 | 424 | ||
425 | m_log.InfoFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); | 425 | // m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); |
426 | 426 | ||
427 | // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export | 427 | // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export |
428 | if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) | 428 | if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) |
429 | denyExportChange = true; | 429 | denyExportChange = true; |
430 | 430 | ||
431 | m_log.InfoFormat("[XXX]: Deny Export Update {0}", denyExportChange); | 431 | // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); |
432 | 432 | ||
433 | // If it is already set, force it set and also force full perm | 433 | // If it is already set, force it set and also force full perm |
434 | // else prevent setting it. It can and should never be set unless | 434 | // else prevent setting it. It can and should never be set unless |
@@ -452,7 +452,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
452 | // If the new state is exportable, force full perm | 452 | // If the new state is exportable, force full perm |
453 | if ((itemUpd.EveryOnePermissions & (uint)PermissionMask.Export) != 0) | 453 | if ((itemUpd.EveryOnePermissions & (uint)PermissionMask.Export) != 0) |
454 | { | 454 | { |
455 | m_log.InfoFormat("[XXX]: Force full perm"); | 455 | // m_log.DebugFormat("[XXX]: Force full perm"); |
456 | itemUpd.NextPermissions = (uint)(PermissionMask.All); | 456 | itemUpd.NextPermissions = (uint)(PermissionMask.All); |
457 | } | 457 | } |
458 | } | 458 | } |