diff options
| author | Melanie | 2010-03-20 15:49:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-20 15:49:39 +0000 |
| commit | f020bd3206c653d7b03f5fbc66ca5ef864fc95e8 (patch) | |
| tree | 2a0c35b4931de992e584147d740d37cf70d6453c | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-f020bd3206c653d7b03f5fbc66ca5ef864fc95e8.zip opensim-SC-f020bd3206c653d7b03f5fbc66ca5ef864fc95e8.tar.gz opensim-SC-f020bd3206c653d7b03f5fbc66ca5ef864fc95e8.tar.bz2 opensim-SC-f020bd3206c653d7b03f5fbc66ca5ef864fc95e8.tar.xz | |
Fix a nullref in permissions when returning objects via right-click
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 4dbdb01..0f830e1 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1324,9 +1324,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1324 | 1324 | ||
| 1325 | // Group voodoo | 1325 | // Group voodoo |
| 1326 | // | 1326 | // |
| 1327 | if (land.LandData.IsGroupOwned) | 1327 | if (l.LandData.IsGroupOwned) |
| 1328 | { | 1328 | { |
| 1329 | powers = (GroupPowers)client.GetGroupPowers(land.LandData.GroupID); | 1329 | powers = (GroupPowers)client.GetGroupPowers(l.LandData.GroupID); |
| 1330 | // Not a group member, or no rights at all | 1330 | // Not a group member, or no rights at all |
| 1331 | // | 1331 | // |
| 1332 | if (powers == (GroupPowers)0) | 1332 | if (powers == (GroupPowers)0) |