diff options
| author | UbitUmarov | 2017-05-12 01:55:15 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-12 01:55:15 +0100 |
| commit | dcdc527401916451e22b9211f62cdd6cd91e14ec (patch) | |
| tree | 46feae802d08845e51c3e57527e6418fb3a192ee /OpenSim/Region | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | avoid a null ref (diff) | |
| download | opensim-SC-dcdc527401916451e22b9211f62cdd6cd91e14ec.zip opensim-SC-dcdc527401916451e22b9211f62cdd6cd91e14ec.tar.gz opensim-SC-dcdc527401916451e22b9211f62cdd6cd91e14ec.tar.bz2 opensim-SC-dcdc527401916451e22b9211f62cdd6cd91e14ec.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index cf96a8b..5b3c3e6 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -12569,11 +12569,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 12569 | } | 12569 | } |
| 12570 | 12570 | ||
| 12571 | int maxWearablesLoop = cachedtex.WearableData.Length; | 12571 | int maxWearablesLoop = cachedtex.WearableData.Length; |
| 12572 | if (maxWearablesLoop > cacheItems.Length) | ||
| 12573 | maxWearablesLoop = cacheItems.Length; | ||
| 12574 | 12572 | ||
| 12575 | if (cacheItems != null) | 12573 | if (cacheItems != null) |
| 12576 | { | 12574 | { |
| 12575 | if (maxWearablesLoop > cacheItems.Length) | ||
| 12576 | maxWearablesLoop = cacheItems.Length; | ||
| 12577 | for (int i = 0; i < maxWearablesLoop; i++) | 12577 | for (int i = 0; i < maxWearablesLoop; i++) |
| 12578 | { | 12578 | { |
| 12579 | int idx = cachedtex.WearableData[i].TextureIndex; | 12579 | int idx = cachedtex.WearableData[i].TextureIndex; |