diff options
author | Jeff Ames | 2008-08-16 17:26:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-16 17:26:25 +0000 |
commit | 6fa26f5b41ab1a455783342c200fe68aeae515aa (patch) | |
tree | 6295bd30044aff271f616b178586acfbb5feeeec /OpenSim/Region/Environment/Modules | |
parent | * Adds Slightly better terrain shading to maptile generation. (diff) | |
download | opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.zip opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.gz opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.bz2 opensim-SC-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
3 files changed, 7 insertions, 7 deletions
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 | |||
97 | if (null != profile) | 97 | if (null != profile) |
98 | { | 98 | { |
99 | Byte[] charterMember; | 99 | Byte[] charterMember; |
100 | if(profile.CustomType == "") | 100 | if (profile.CustomType == "") |
101 | { | 101 | { |
102 | charterMember = new Byte[1]; | 102 | charterMember = new Byte[1]; |
103 | charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8); | 103 | 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 | |||
162 | ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); | 162 | ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); |
163 | 163 | ||
164 | fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); | 164 | fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); |
165 | if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 165 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) |
166 | fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 166 | fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
167 | else | 167 | else |
168 | fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 168 | fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
@@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
934 | { | 934 | { |
935 | if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) | 935 | if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) |
936 | { | 936 | { |
937 | if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 937 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) |
938 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 938 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
939 | else | 939 | else |
940 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 940 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; |
@@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land | |||
951 | { | 951 | { |
952 | if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) | 952 | if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) |
953 | { | 953 | { |
954 | if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) | 954 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) |
955 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; | 955 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; |
956 | else | 956 | else |
957 | landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; | 957 | 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 | |||
246 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) | 246 | if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) |
247 | return true; | 247 | return true; |
248 | } | 248 | } |
249 | if(m_allowGridGods) | 249 | if (m_allowGridGods) |
250 | { | 250 | { |
251 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); | 251 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); |
252 | if(profile != null && profile.UserProfile != null) | 252 | if (profile != null && profile.UserProfile != null) |
253 | { | 253 | { |
254 | if(profile.UserProfile.GodLevel >= 200) | 254 | if (profile.UserProfile.GodLevel >= 200) |
255 | return true; | 255 | return true; |
256 | } | 256 | } |
257 | } | 257 | } |