OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-09-18 03:47:42 +02:00
parent e9af09084c ac2380bbfa
commit b4209caadd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -116,6 +116,8 @@ namespace OpenSim.Region.ClientStack.Linden
private bool m_dumpAssetsToFile = false; private bool m_dumpAssetsToFile = false;
private string m_regionName; private string m_regionName;
private int m_levelUpload = 0; private int m_levelUpload = 0;
private bool m_addNewTextures = false;
private bool m_addNewMeshes = false;
public BunchOfCaps(Scene scene, Caps caps) public BunchOfCaps(Scene scene, Caps caps)
{ {
@ -627,7 +629,7 @@ namespace OpenSim.Region.ClientStack.Linden
textures.Add(textureAsset.FullID); textures.Add(textureAsset.FullID);
// save it to inventory // save it to inventory
if (AddNewInventoryItem != null) if (m_addNewTextures && AddNewInventoryItem != null)
{ {
string name = assetName; string name = assetName;
if (name.Length > 25) if (name.Length > 25)
@ -673,7 +675,7 @@ namespace OpenSim.Region.ClientStack.Linden
meshAssets.Add(meshAsset.FullID); meshAssets.Add(meshAsset.FullID);
// save it to inventory // save it to inventory
if (AddNewInventoryItem != null) if (m_addNewMeshes && AddNewInventoryItem != null)
{ {
string name = assetName; string name = assetName;
if (name.Length > 25) if (name.Length > 25)