From db41c04f9d6c35c0e08e83505a61b17c0564236b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 26 Sep 2014 02:29:05 +0100 Subject: little debug --- .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index e8ad0f2..1ede7ae 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -178,7 +178,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess sbyte assetType, byte wearableType, uint nextOwnerMask, int creationDate) { - m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}", name, folderID); + m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}, transactionID {2}", name, + folderID, transactionID); if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) return; @@ -220,6 +221,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess m_Scene.CreateNewInventoryItem( remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); + m_log.DebugFormat("Asset stored and inventory item created"); } else { -- cgit v1.1 From d29a04fc20a7d8a72944ffe835c7e758aa2712ed Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Fri, 26 Sep 2014 03:52:10 +0100 Subject: remove debug msgs --- .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 1ede7ae..b3dc0c0 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -220,8 +220,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess m_Scene.AssetService.Store(asset); m_Scene.CreateNewInventoryItem( remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, - name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); - m_log.DebugFormat("Asset stored and inventory item created"); + name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); } else { -- cgit v1.1 From f117a86c87f0868cb6ddbc29f341a3a75290c2a0 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 Sep 2014 03:31:04 +0100 Subject: fix musicURL change being sent back with wrong snap_selection, and not sent to other avatars. --- .../CoreModules/World/Land/LandManagementModule.cs | 42 +++++++++++----------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index c8555ab..bbb280b 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -1200,32 +1200,30 @@ namespace OpenSim.Region.CoreModules.World.Land { //the proprieties to who changed them - land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client); + land.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, remote_client); - if (needOverlay) - { - UUID parcelID = land.LandData.GlobalID; - m_scene.ForEachScenePresence(delegate(ScenePresence avatar) - { - if (avatar.IsDeleted || avatar.isNPC) - return; + UUID parcelID = land.LandData.GlobalID; + m_scene.ForEachScenePresence(delegate(ScenePresence avatar) + { + if (avatar.IsDeleted || avatar.isNPC) + return; - IClientAPI client = avatar.ControllingClient; + IClientAPI client = avatar.ControllingClient; + if (needOverlay) SendParcelOverlay(client); - if (avatar.IsChildAgent) - return; - - ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); - if (aland != null) - { - if (client != remote_client || land != aland) - aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); - } - if (avatar.currentParcelUUID == parcelID) - avatar.currentParcelUUID = parcelID; // force parcel flags review - }); - } + if (avatar.IsChildAgent) + return; + + ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); + if (aland != null) + { + if (client != remote_client || land != aland) + aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); + } + if (avatar.currentParcelUUID == parcelID) + avatar.currentParcelUUID = parcelID; // force parcel flags review + }); } } -- cgit v1.1 From c704b079d8973ea491a9013b08bb8ace3979cd93 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 30 Sep 2014 04:24:31 +0100 Subject: persist script changes to mediaURL and musicURL ( heavy thing ) --- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index e002feb..a3cd4a5 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -1244,6 +1244,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMediaUrl(string url) { LandData.MediaURL = url; + m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData); SendLandUpdateToAvatarsOverMe(); } @@ -1254,6 +1255,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMusicUrl(string url) { LandData.MusicURL = url; + m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData); SendLandUpdateToAvatarsOverMe(); } -- cgit v1.1