diff options
| author | UbitUmarov | 2015-11-18 17:35:26 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-18 17:35:26 +0000 |
| commit | 6dafce9a1255317fdc0fbd882695f46b784481f5 (patch) | |
| tree | 2425e9a91e788cc20bf10c52101debc529e76111 /OpenSim/Region | |
| parent | work around some 'tests' errors: dont expect a particular http error response (diff) | |
| download | opensim-SC-6dafce9a1255317fdc0fbd882695f46b784481f5.zip opensim-SC-6dafce9a1255317fdc0fbd882695f46b784481f5.tar.gz opensim-SC-6dafce9a1255317fdc0fbd882695f46b784481f5.tar.bz2 opensim-SC-6dafce9a1255317fdc0fbd882695f46b784481f5.tar.xz | |
fix another variable number of wearable types issue
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index cb210af..21b6789 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -870,8 +870,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | // Ignore ruth's assets | 872 | // Ignore ruth's assets |
| 873 | if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID) | 873 | if (i < AvatarWearable.DefaultWearables.Length) |
| 874 | continue; | 874 | { |
| 875 | if (appearance.Wearables[i][j].ItemID == AvatarWearable.DefaultWearables[i][0].ItemID) | ||
| 876 | continue; | ||
| 877 | } | ||
| 875 | 878 | ||
| 876 | InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID); | 879 | InventoryItemBase baseItem = new InventoryItemBase(appearance.Wearables[i][j].ItemID, userID); |
| 877 | baseItem = invService.GetItem(baseItem); | 880 | baseItem = invService.GetItem(baseItem); |