From ac2380bbfa5f7f2be8a5a9197f099a88988bce22 Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 18 Sep 2012 02:12:07 +0200 Subject: [PATCH] Add booleans to control whether we actually crete inventory items --- .../ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 3789ee94ad..cb6f7a13d6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -116,6 +116,8 @@ namespace OpenSim.Region.ClientStack.Linden private bool m_dumpAssetsToFile = false; private string m_regionName; private int m_levelUpload = 0; + private bool m_addNewTextures = false; + private bool m_addNewMeshes = false; public BunchOfCaps(Scene scene, Caps caps) { @@ -627,7 +629,7 @@ namespace OpenSim.Region.ClientStack.Linden textures.Add(textureAsset.FullID); // save it to inventory - if (AddNewInventoryItem != null) + if (m_addNewTextures && AddNewInventoryItem != null) { string name = assetName; if (name.Length > 25) @@ -673,7 +675,7 @@ namespace OpenSim.Region.ClientStack.Linden meshAssets.Add(meshAsset.FullID); // save it to inventory - if (AddNewInventoryItem != null) + if (m_addNewMeshes && AddNewInventoryItem != null) { string name = assetName; if (name.Length > 25)