ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, formatting cleanup, fix a couple compiler warnings.

Browse Source
This commit is contained in:
Jeff Ames
2008-08-15 10:24:04 +00:00
parent e1620c5cc3
commit dde21314e7
13 changed files with 80 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@@ -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;
}

12
OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs
View File

@@ -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);
}