From ac93ba9f85e5bcbcfe69fefbfd0b71a0885bac81 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 20 Jan 2015 00:19:33 +0000 Subject: minor: correct SceneCommunicationService.LogHeader spelling Relates to http://opensimulator.org/mantis/view.php?id=7337 --- OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 8101768..c8c8714 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.Framework.Scenes public class SceneCommunicationService //one instance per region { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static string LogHeader = "[SCENE COMMUNIATION SERVICE]"; + private static string LogHeader = "[SCENE COMMUNICATION SERVICE]"; protected RegionInfo m_regionInfo; protected Scene m_scene; -- cgit v1.1 From a846e63c707d624f5fe7504aba43fe7a57a18ea1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 21 Jan 2015 00:21:27 +0000 Subject: If [Permissions] serverside_object_permissions = false or the undocumented propogate_permissions = false, don't propogate permissions of prim inventory items. This was a regression from 13f31fd (4 Nov 2013) Relates to http://opensimulator.org/mantis/view.php?id=7399 --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index c318e53..1ca250a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -4836,7 +4836,10 @@ namespace OpenSim.Region.Framework.Scenes if (OwnerID != item.Owner) { //LogPermissions("Before ApplyNextOwnerPermissions"); - ApplyNextOwnerPermissions(); + + if (scene.Permissions.PropagatePermissions()) + ApplyNextOwnerPermissions(); + //LogPermissions("After ApplyNextOwnerPermissions"); LastOwnerID = OwnerID; -- cgit v1.1 From 25dd30ddb6ef883237da8cc5bbc83519471819ce Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 21 Jan 2015 00:33:54 +0000 Subject: minor: Fix some CR line endings in Scene.Inventory.cs --- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 8bd0c0a..55db968 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -40,7 +40,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework; using OpenSim.Framework.Client; using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes.Serialization; +using OpenSim.Region.Framework.Scenes.Serialization; using OpenSim.Services.Interfaces; using PermissionMask = OpenSim.Framework.PermissionMask; @@ -127,11 +127,11 @@ namespace OpenSim.Region.Framework.Scenes return false; } - } - - public bool AddInventoryItem(InventoryItemBase item) - { - return AddInventoryItem(item, true); + } + + public bool AddInventoryItem(InventoryItemBase item) + { + return AddInventoryItem(item, true); } /// @@ -1074,7 +1074,7 @@ namespace OpenSim.Region.Framework.Scenes // } CreateNewInventoryItem( - remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, + remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, description, 0, callbackID, olditemID, type, invType, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All, (uint)PermissionMask.All | (uint)PermissionMask.Export, (uint)PermissionMask.All | (uint)PermissionMask.Export, Util.UnixTimeSinceEpoch(), @@ -2183,7 +2183,7 @@ namespace OpenSim.Region.Framework.Scenes } } - // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted + // OK, we're done with permissions. Let's check if any part of the code prevents the objects from being deleted bool canDelete = EventManager.TriggerDeRezRequested(remoteClient, deleteGroups, action); if (permissionToTake && (action != DeRezAction.Delete || this.m_useTrashOnDelete)) -- cgit v1.1 From aef6fd6927d71aef34396d08cd31f108bc907318 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 21 Jan 2015 20:54:23 +0000 Subject: If the SnedInventoryAync() method receives an exception log this but make sure it does not terminate the process. Relates to http://opensimulator.org/mantis/view.php?id=7421 --- OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/Framework') diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index ea242f5..ef2125b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -487,7 +487,16 @@ namespace OpenSim.Region.Framework.Scenes void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) { - SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); + try + { + SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); + } + catch (Exception e) + { + m_log.Error( + string.Format( + "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}. Exception ", e)); + } } void SendInventoryComplete(IAsyncResult iar) -- cgit v1.1