diff options
| author | Diva Canto | 2016-06-18 17:00:15 -0700 |
|---|---|---|
| committer | Diva Canto | 2016-06-18 17:00:15 -0700 |
| commit | 206faf0218b5bc8467a8d0468170995d1d2ae66d (patch) | |
| tree | cab6353558810db969a4820409d5f8e97ce10335 /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-206faf0218b5bc8467a8d0468170995d1d2ae66d.zip opensim-SC-206faf0218b5bc8467a8d0468170995d1d2ae66d.tar.gz opensim-SC-206faf0218b5bc8467a8d0468170995d1d2ae66d.tar.bz2 opensim-SC-206faf0218b5bc8467a8d0468170995d1d2ae66d.tar.xz | |
Guard against occurring null ref.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 5a9f88e..c9c8639 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2571,7 +2571,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2571 | { | 2571 | { |
| 2572 | AgentPrefs prefs = AgentPreferencesService.GetAgentPreferences(ownerID); | 2572 | AgentPrefs prefs = AgentPreferencesService.GetAgentPreferences(ownerID); |
| 2573 | // Only apply user selected prefs if the user set them | 2573 | // Only apply user selected prefs if the user set them |
| 2574 | if (prefs.PermNextOwner != 0) | 2574 | if (prefs != null && prefs.PermNextOwner != 0) |
| 2575 | { | 2575 | { |
| 2576 | sceneObject.RootPart.GroupMask = (uint)prefs.PermGroup; | 2576 | sceneObject.RootPart.GroupMask = (uint)prefs.PermGroup; |
| 2577 | sceneObject.RootPart.EveryoneMask = (uint)prefs.PermEveryone; | 2577 | sceneObject.RootPart.EveryoneMask = (uint)prefs.PermEveryone; |