diff options
| author | Melanie | 2012-10-17 20:46:38 +0200 |
|---|---|---|
| committer | Melanie | 2012-10-17 20:46:38 +0200 |
| commit | 0ca96669321b1a33190d0d93ae8f7b3aee60f492 (patch) | |
| tree | ac3b6297630f461f468a13550eaabe571f993ac6 /OpenSim/Region/CoreModules | |
| parent | Allow the console to be used by gods as well as region owners. (diff) | |
| parent | coment a debug warning (diff) | |
| download | opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.zip opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.gz opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.bz2 opensim-SC-0ca96669321b1a33190d0d93ae8f7b3aee60f492.tar.xz | |
Merge branch 'ubitwork' into avination
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index bd7bd82..4cb4370 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -525,7 +525,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 525 | { | 525 | { |
| 526 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) | 526 | for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) |
| 527 | { | 527 | { |
| 528 | for (int j = 0; j < appearance.Wearables[j].Count; j++) | 528 | for (int j = 0; j < appearance.Wearables[i].Count; j++) |
| 529 | { | 529 | { |
| 530 | if (appearance.Wearables[i][j].ItemID == UUID.Zero) | 530 | if (appearance.Wearables[i][j].ItemID == UUID.Zero) |
| 531 | continue; | 531 | continue; |