aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-09-18 02:12:07 +0200
committerMelanie2012-09-18 02:12:07 +0200
commitac2380bbfa5f7f2be8a5a9197f099a88988bce22 (patch)
tree9a2e5fe3ee8f8849b2168b5f9250c810fce1ecbd /OpenSim
parent***TEST*** still bad... create inventory itens for model textures and meshs.... (diff)
downloadopensim-SC_OLD-ac2380bbfa5f7f2be8a5a9197f099a88988bce22.zip
opensim-SC_OLD-ac2380bbfa5f7f2be8a5a9197f099a88988bce22.tar.gz
opensim-SC_OLD-ac2380bbfa5f7f2be8a5a9197f099a88988bce22.tar.bz2
opensim-SC_OLD-ac2380bbfa5f7f2be8a5a9197f099a88988bce22.tar.xz
Add booleans to control whether we actually crete inventory items
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs6
1 files 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 3789ee9..cb6f7a1 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
116 private bool m_dumpAssetsToFile = false; 116 private bool m_dumpAssetsToFile = false;
117 private string m_regionName; 117 private string m_regionName;
118 private int m_levelUpload = 0; 118 private int m_levelUpload = 0;
119 private bool m_addNewTextures = false;
120 private bool m_addNewMeshes = false;
119 121
120 public BunchOfCaps(Scene scene, Caps caps) 122 public BunchOfCaps(Scene scene, Caps caps)
121 { 123 {
@@ -627,7 +629,7 @@ namespace OpenSim.Region.ClientStack.Linden
627 textures.Add(textureAsset.FullID); 629 textures.Add(textureAsset.FullID);
628 630
629 // save it to inventory 631 // save it to inventory
630 if (AddNewInventoryItem != null) 632 if (m_addNewTextures && AddNewInventoryItem != null)
631 { 633 {
632 string name = assetName; 634 string name = assetName;
633 if (name.Length > 25) 635 if (name.Length > 25)
@@ -673,7 +675,7 @@ namespace OpenSim.Region.ClientStack.Linden
673 meshAssets.Add(meshAsset.FullID); 675 meshAssets.Add(meshAsset.FullID);
674 676
675 // save it to inventory 677 // save it to inventory
676 if (AddNewInventoryItem != null) 678 if (m_addNewMeshes && AddNewInventoryItem != null)
677 { 679 {
678 string name = assetName; 680 string name = assetName;
679 if (name.Length > 25) 681 if (name.Length > 25)