aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AvatarAppearance.cs
diff options
context:
space:
mode:
authorMelanie Thielker2015-09-14 00:35:31 +0200
committerMelanie Thielker2015-09-14 00:35:31 +0200
commit9d1515efdbd8d7b515e4e550fe047ba03ca3f91d (patch)
treeab4ab305cb38352cfe986a3ec01ca6fddeb24434 /OpenSim/Framework/AvatarAppearance.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-9d1515efdbd8d7b515e4e550fe047ba03ca3f91d.zip
opensim-SC_OLD-9d1515efdbd8d7b515e4e550fe047ba03ca3f91d.tar.gz
opensim-SC_OLD-9d1515efdbd8d7b515e4e550fe047ba03ca3f91d.tar.bz2
opensim-SC_OLD-9d1515efdbd8d7b515e4e550fe047ba03ca3f91d.tar.xz
Make regions tolerant to newer regions with more werables.
Also, bump the interface version to 8
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 69113b1..f442fc2 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -458,8 +458,11 @@ namespace OpenSim.Framework
458// m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID); 458// m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
459// DEBUG OFF 459// DEBUG OFF
460 m_wearables[wearableId].Clear(); 460 m_wearables[wearableId].Clear();
461 for (int i = 0; i < wearable.Count; i++) 461 int count = wearable.Count;
462 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); 462 if (count > AvatarWearable.MAX_WEARABLES)
463 count = AvatarWearable.MAX_WEARABLES;
464 for (int i = 0; i < count; i++)
465 m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
463 } 466 }
464 467
465// DEBUG ON 468// DEBUG ON