aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World
diff options
context:
space:
mode:
authorJeff Ames2008-08-15 10:24:04 +0000
committerJeff Ames2008-08-15 10:24:04 +0000
commitdde21314e75acdaeff27af70077f283493401961 (patch)
tree490ab065895adb41ee4771fce623f99faa60b507 /OpenSim/Region/Environment/Modules/World
parentFixes a case where, when inventory is not currently accessible due (diff)
downloadopensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.zip
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.gz
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.bz2
opensim-SC_OLD-dde21314e75acdaeff27af70077f283493401961.tar.xz
Update svn properties, formatting cleanup, fix a couple compiler warnings.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs12
2 files changed, 8 insertions, 8 deletions
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
238 // If there is no master avatar, return false 238 // If there is no master avatar, return false
239 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) 239 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
240 { 240 {
241 if(m_scene.RegionInfo.MasterAvatarAssignedUUID == user) 241 if (m_scene.RegionInfo.MasterAvatarAssignedUUID == user)
242 return true; 242 return true;
243 } 243 }
244 if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) 244 if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
245 { 245 {
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 249
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
98 { 98 {
99 if (args[0] == "tree") 99 if (args[0] == "tree")
100 { 100 {
101 LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; 101 LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
102 if(uuid == LLUUID.Zero) 102 if (uuid == LLUUID.Zero)
103 uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; 103 uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
104 m_log.Debug("[TREES]: New tree planting"); 104 m_log.Debug("[TREES]: New tree planting");
105 CreateTree(uuid, new LLVector3(128.0f, 128.0f, 0.0f)); 105 CreateTree(uuid, new LLVector3(128.0f, 128.0f, 0.0f));
106 } 106 }
@@ -223,9 +223,9 @@ namespace OpenSim.Region.Environment.Modules.World.TreePopulator
223 position.X += (float) randX; 223 position.X += (float) randX;
224 position.Y += (float) randY; 224 position.Y += (float) randY;
225 225
226 LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner; 226 LLUUID uuid = m_scene.RegionInfo.EstateSettings.EstateOwner;
227 if(uuid == LLUUID.Zero) 227 if (uuid == LLUUID.Zero)
228 uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID; 228 uuid = m_scene.RegionInfo.MasterAvatarAssignedUUID;
229 229
230 CreateTree(uuid, position); 230 CreateTree(uuid, position);
231 } 231 }