diff options
| author | Jeff Ames | 2009-11-23 11:26:06 +0900 |
|---|---|---|
| committer | Jeff Ames | 2009-11-23 11:26:06 +0900 |
| commit | 9f5c2acd128828d220bf7e47bd4fe13d7a2a910b (patch) | |
| tree | bb1a273746c4b2a466dd705537a2457f0474faa2 /OpenSim/Region/CoreModules/World | |
| parent | * Added missing lock to m_forcelist when AddForce is called. When a user dr... (diff) | |
| download | opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.zip opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.gz opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.bz2 opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.xz | |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 0bd225e..1fa8630 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
| @@ -318,7 +318,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 318 | } | 318 | } |
| 319 | 319 | ||
| 320 | public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client) | 320 | public void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client) |
| 321 | { | 321 | { |
| 322 | SendLandProperties(0, snap_selection, 0, remote_client); | 322 | SendLandProperties(0, snap_selection, 0, remote_client); |
| 323 | } | 323 | } |
| 324 | 324 | ||
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index c790624..013a0ef 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -486,21 +486,21 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 486 | } | 486 | } |
| 487 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) | 487 | protected bool IsFriendWithPerms(UUID user,UUID objectOwner) |
| 488 | { | 488 | { |
| 489 | 489 | ||
| 490 | if (user == UUID.Zero) | 490 | if (user == UUID.Zero) |
| 491 | return false; | 491 | return false; |
| 492 | 492 | ||
| 493 | if (m_friendsModule == null) | 493 | if (m_friendsModule == null) |
| 494 | return false; | 494 | return false; |
| 495 | 495 | ||
| 496 | List<FriendListItem> profile = m_friendsModule.GetUserFriends(user); | 496 | List<FriendListItem> profile = m_friendsModule.GetUserFriends(user); |
| 497 | 497 | ||
| 498 | foreach (FriendListItem item in profile) | 498 | foreach (FriendListItem item in profile) |
| 499 | { | 499 | { |
| 500 | if(item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) | 500 | if (item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0) |
| 501 | return true; | 501 | return true; |
| 502 | } | 502 | } |
| 503 | return false; | 503 | return false; |
| 504 | } | 504 | } |
| 505 | 505 | ||
| 506 | protected bool IsEstateManager(UUID user) | 506 | protected bool IsEstateManager(UUID user) |