Make regions tolerant to newer regions with more werables.

Also, bump the interface version to 8
0.8.2-post-fixes
Melanie Thielker 2015-09-14 00:35:31 +02:00
parent a6012a3fae
commit 9d1515efdb
2 changed files with 6 additions and 3 deletions

View File

@ -458,8 +458,11 @@ namespace OpenSim.Framework
// m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID); // m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
// DEBUG OFF // DEBUG OFF
m_wearables[wearableId].Clear(); m_wearables[wearableId].Clear();
for (int i = 0; i < wearable.Count; i++) int count = wearable.Count;
m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); if (count > AvatarWearable.MAX_WEARABLES)
count = AvatarWearable.MAX_WEARABLES;
for (int i = 0; i < count; i++)
m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
} }
// DEBUG ON // DEBUG ON

View File

@ -71,6 +71,6 @@ namespace OpenSim
/// of the code that is too old. /// of the code that is too old.
/// ///
/// </value> /// </value>
public readonly static int MajorInterfaceVersion = 7; public readonly static int MajorInterfaceVersion = 8;
} }
} }