diff options
| author | Melanie | 2011-11-17 19:04:27 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-17 19:04:27 +0000 |
| commit | 31736b1aac0387e51fe37ea9bab2e2e8c86988b6 (patch) | |
| tree | 14fbdc5f9b677185db1fe8080dafe28796c09336 /OpenSim/Region/CoreModules/World/Permissions | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ow... (diff) | |
| download | opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.zip opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.gz opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.bz2 opensim-SC-31736b1aac0387e51fe37ea9bab2e2e8c86988b6.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 2e877f0..3963474 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -479,8 +479,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 479 | } | 479 | } |
| 480 | 480 | ||
| 481 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) | 481 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) |
| 482 | { | 482 | { |
| 483 | |||
| 484 | if (user == UUID.Zero) | 483 | if (user == UUID.Zero) |
| 485 | return false; | 484 | return false; |
| 486 | 485 | ||