diff options
author | Melanie | 2010-04-13 04:13:26 +0100 |
---|---|---|
committer | Melanie | 2010-04-13 04:13:26 +0100 |
commit | a1c4585a392955bb80452da94002414ab0c6a269 (patch) | |
tree | d42f39aa7f00289888a305e38b0cab1fbc1bab65 /OpenSim/Region/ClientStack | |
parent | Fixed LINEAR_MOTOR Z drive, Mantis #30 (diff) | |
parent | Changed the GetTextureModule backport to work with the 0.6.9 codebase (diff) | |
download | opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.zip opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.gz opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.bz2 opensim-SC-a1c4585a392955bb80452da94002414ab0c6a269.tar.xz |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b0e3655..731dc8e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -11215,9 +11215,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11215 | 11215 | ||
11216 | m_groupPowers.Clear(); | 11216 | m_groupPowers.Clear(); |
11217 | 11217 | ||
11218 | for (int i = 0; i < GroupMembership.Length; i++) | 11218 | if (GroupMembership != null) |
11219 | { | 11219 | { |
11220 | m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers; | 11220 | for (int i = 0; i < GroupMembership.Length; i++) |
11221 | { | ||
11222 | m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers; | ||
11223 | } | ||
11221 | } | 11224 | } |
11222 | } | 11225 | } |
11223 | } | 11226 | } |