diff options
author | Melanie Thielker | 2015-09-14 00:35:31 +0200 |
---|---|---|
committer | Melanie Thielker | 2015-09-14 00:35:31 +0200 |
commit | 9d1515efdbd8d7b515e4e550fe047ba03ca3f91d (patch) | |
tree | ab4ab305cb38352cfe986a3ec01ca6fddeb24434 /OpenSim | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-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')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 2 |
2 files changed, 6 insertions, 3 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 |
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index d2979a7..a285db0 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
@@ -71,6 +71,6 @@ namespace OpenSim | |||
71 | /// of the code that is too old. | 71 | /// of the code that is too old. |
72 | /// | 72 | /// |
73 | /// </value> | 73 | /// </value> |
74 | public readonly static int MajorInterfaceVersion = 7; | 74 | public readonly static int MajorInterfaceVersion = 8; |
75 | } | 75 | } |
76 | } | 76 | } |