diff options
| author | UbitUmarov | 2016-07-30 21:02:08 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-30 21:02:08 +0100 |
| commit | a63aef978a28d0c9f93d0de9ee1a055a1dfbb4de (patch) | |
| tree | b5df1181fdb5aae6bdb2c7958bd016f99bb1f10e /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix NULL references added in recente changes in standalone mode (diff) | |
| download | opensim-SC-a63aef978a28d0c9f93d0de9ee1a055a1dfbb4de.zip opensim-SC-a63aef978a28d0c9f93d0de9ee1a055a1dfbb4de.tar.gz opensim-SC-a63aef978a28d0c9f93d0de9ee1a055a1dfbb4de.tar.bz2 opensim-SC-a63aef978a28d0c9f93d0de9ee1a055a1dfbb4de.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index c592385..e985903 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -4671,9 +4671,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4671 | ControllingClient.ActiveGroupName = cAgent.ActiveGroupName; | 4671 | ControllingClient.ActiveGroupName = cAgent.ActiveGroupName; |
| 4672 | ControllingClient.ActiveGroupPowers = 0; | 4672 | ControllingClient.ActiveGroupPowers = 0; |
| 4673 | Grouptitle = cAgent.ActiveGroupTitle; | 4673 | Grouptitle = cAgent.ActiveGroupTitle; |
| 4674 | int ngroups = cAgent.Groups.Length; | 4674 | |
| 4675 | if(ngroups > 0) | 4675 | if(cAgent.Groups != null && cAgent.Groups.Length > 0) |
| 4676 | { | 4676 | { |
| 4677 | int ngroups = cAgent.Groups.Length; | ||
| 4677 | Dictionary<UUID, ulong> gpowers = new Dictionary<UUID, ulong>(ngroups); | 4678 | Dictionary<UUID, ulong> gpowers = new Dictionary<UUID, ulong>(ngroups); |
| 4678 | for(int i = 0 ; i < ngroups; i++) | 4679 | for(int i = 0 ; i < ngroups; i++) |
| 4679 | { | 4680 | { |