From 6fa26f5b41ab1a455783342c200fe68aeae515aa Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sat, 16 Aug 2008 17:26:25 +0000 Subject: Update svn properties, minor formatting cleanup. --- .../Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs | 2 +- .../Region/Environment/Modules/World/Land/LandManagementModule.cs | 6 +++--- .../Environment/Modules/World/Permissions/PermissionsModule.cs | 6 +++--- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 1d1d503..20b1c1c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs @@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles if (null != profile) { Byte[] charterMember; - if(profile.CustomType == "") + if (profile.CustomType == "") { charterMember = new Byte[1]; charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8); diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index d5cb0eb..92eda80 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs @@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); - if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) + if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; else fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; @@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land { if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) { - if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) + if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; else landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; @@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land { if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) { - if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) + if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; else landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index b3da36c..2394a30 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -246,12 +246,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) return true; } - if(m_allowGridGods) + if (m_allowGridGods) { CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); - if(profile != null && profile.UserProfile != null) + if (profile != null && profile.UserProfile != null) { - if(profile.UserProfile.GodLevel >= 200) + if (profile.UserProfile.GodLevel >= 200) return true; } } diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 8dcfc03..cad2496 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes // who is granted god powers, but has no god level set. // CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID); - if(profile.UserProfile.GodLevel > 0) + if (profile.UserProfile.GodLevel > 0) m_godlevel = profile.UserProfile.GodLevel; else m_godlevel = 200; -- cgit v1.1