update the max number of texture faces and wearables to current values.
This should be safe now..avinationmerge
parent
73cbdf2c6b
commit
7486684436
|
@ -53,7 +53,11 @@ namespace OpenSim.Framework
|
|||
// should be only used as initial default value ( V1 viewers )
|
||||
public readonly static int VISUALPARAM_COUNT = 218;
|
||||
|
||||
public readonly static int TEXTURE_COUNT = 21;
|
||||
// public readonly static int TEXTURE_COUNT = 21
|
||||
// 21 bad, make it be updated as libovm gets update
|
||||
// also keeping in sync with it
|
||||
public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
|
||||
|
||||
public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
|
||||
|
||||
protected int m_serial = 0;
|
||||
|
|
|
@ -67,10 +67,10 @@ namespace OpenSim.Framework
|
|||
|
||||
public static readonly int ALPHA = 13;
|
||||
public static readonly int TATTOO = 14;
|
||||
// public static readonly int PHYSICS = 15;
|
||||
public static readonly int PHYSICS = 15;
|
||||
|
||||
// public static readonly int MAX_WEARABLES = 16;
|
||||
public static readonly int MAX_WEARABLES = 15;
|
||||
public static readonly int MAX_WEARABLES = 16;
|
||||
// public static readonly int MAX_WEARABLES = 15;
|
||||
|
||||
public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
|
||||
public static readonly UUID DEFAULT_BODY_ASSET = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
|
||||
|
|
|
@ -43,12 +43,14 @@ namespace OpenSim.Framework
|
|||
|
||||
public static WearableCacheItem[] GetDefaultCacheItem()
|
||||
{
|
||||
int itemmax = 21;
|
||||
int itemmax = AvatarAppearance.TEXTURE_COUNT;
|
||||
WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
|
||||
for (uint i=0;i<itemmax;i++)
|
||||
retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
|
||||
return retitems;
|
||||
return retitems;
|
||||
}
|
||||
|
||||
|
||||
public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)
|
||||
{
|
||||
List<WearableCacheItem> ret = new List<WearableCacheItem>();
|
||||
|
|
Loading…
Reference in New Issue