diff options
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index 5b82d4c..2109336 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -57,10 +57,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
57 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) | 57 | if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) |
58 | sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; | 58 | sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; |
59 | UUID estateOwner; | 59 | UUID estateOwner; |
60 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 60 | estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; |
61 | estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
62 | else | ||
63 | estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
64 | 61 | ||
65 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) | 62 | if (m_scene.Permissions.IsGod(remote_client.AgentId)) |
66 | estateOwner = remote_client.AgentId; | 63 | estateOwner = remote_client.AgentId; |
@@ -230,8 +227,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
230 | 227 | ||
231 | if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) | 228 | if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) |
232 | return; // never process EO | 229 | return; // never process EO |
233 | if (user == m_scene.RegionInfo.MasterAvatarAssignedUUID) | ||
234 | return; // never process owner | ||
235 | 230 | ||
236 | switch (estateAccessType) | 231 | switch (estateAccessType) |
237 | { | 232 | { |
@@ -741,14 +736,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
741 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; | 736 | args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; |
742 | args.regionFlags = GetRegionFlags(); | 737 | args.regionFlags = GetRegionFlags(); |
743 | args.regionName = m_scene.RegionInfo.RegionName; | 738 | args.regionName = m_scene.RegionInfo.RegionName; |
744 | if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) | 739 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; |
745 | args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner; | ||
746 | else | ||
747 | args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID; | ||
748 | |||
749 | // Fudge estate owner | ||
750 | //if (m_scene.Permissions.IsGod(remoteClient.AgentId)) | ||
751 | // args.SimOwner = remoteClient.AgentId; | ||
752 | 740 | ||
753 | args.terrainBase0 = UUID.Zero; | 741 | args.terrainBase0 = UUID.Zero; |
754 | args.terrainBase1 = UUID.Zero; | 742 | args.terrainBase1 = UUID.Zero; |
@@ -1127,8 +1115,6 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1127 | 1115 | ||
1128 | public bool IsManager(UUID avatarID) | 1116 | public bool IsManager(UUID avatarID) |
1129 | { | 1117 | { |
1130 | if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID) | ||
1131 | return true; | ||
1132 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) | 1118 | if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) |
1133 | return true; | 1119 | return true; |
1134 | 1120 | ||