From 8f3940538061ba7a4e9e14d75b020d72a8bb86e3 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 27 May 2020 00:18:32 +0100 Subject: [PATCH] err ok not so fast --- .../Framework/InventoryAccess/InventoryAccessModule.cs | 2 ++ OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index fe14ebb6e5..0cd6467b21 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs @@ -228,6 +228,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess } if(assetType == (byte)AssetType.Settings) { + /* this is wrong subtype may need to be checked if(data == null) { IEnvironmentModule envModule = m_Scene.RequestModuleInterface(); @@ -241,6 +242,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess return; } } + */ flags = subType; } else if( assetType == (byte)AssetType.Clothing || diff --git a/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs b/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs index 7a7b78202d..80cf2dcc4b 100644 --- a/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEnvironmentModule.cs @@ -26,11 +26,15 @@ */ using OpenMetaverse; +using OpenSim.Framework; namespace OpenSim.Region.Framework.Interfaces { public interface IEnvironmentModule { void ResetEnvironmentSettings(UUID regionUUID); + //void FromLightShare(RegionLightShareData wl); + //RegionLightShareData ToLightShare(); + //byte[] GetDefaultAssetData(string name); } }