From dde21314e75acdaeff27af70077f283493401961 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 15 Aug 2008 10:24:04 +0000 Subject: Update svn properties, formatting cleanup, fix a couple compiler warnings. --- .../Modules/World/Permissions/PermissionsModule.cs | 4 ++-- .../Modules/World/TreePopulator/TreePopulatorModule.cs | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Environment/Modules') diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 25ea282..0fbd4fb 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs @@ -238,12 +238,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions // If there is no master avatar, return false if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) { - if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user) + if (m_scene.RegionInfo.MasterAvatarAssignedUUID == user) return true; } if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) { - if(m_scene.RegionInfo.EstateSettings.EstateOwner == user) + if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) return true; } diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index cb69b47..98b3bf8 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs @@ -98,9 +98,9 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator { if (args[0] == "tree") { - LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; - if(uuid == LLUUID.Zero) - uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; + LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; + if (uuid == LLUUID.Zero) + uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; m_log.Debug("[TREES]: New tree planting"); CreateTree(uuid, new LLVector3(128.0f, 128.0f, 0.0f)); } @@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator position.X += (float) randX; position.Y += (float) randY; - LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; - if(uuid == LLUUID.Zero) - uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; + LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; + if (uuid == LLUUID.Zero) + uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; CreateTree(uuid, position); } -- cgit v1.1