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

A bit more estate fudging

Browse Source
This commit is contained in:
Melanie Thielker
2008-10-10 02:06:34 +00:00
parent 96689723e5
commit 5c5a640aba
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@@ -52,8 +52,18 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
//SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant)
uint sun = 0;
if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime)
sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800;
UUID estateOwner;
if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
else
estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
if (m_scene.ExternalChecks.ExternalChecksCanBeGodLike(remote_client.AgentId))
estateOwner = remote_client.AgentId;
remote_client.SendDetailedEstateData(invoice,
m_scene.RegionInfo.EstateSettings.EstateName,
m_scene.RegionInfo.EstateSettings.EstateID,
@@ -61,7 +71,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
GetEstateFlags(),
sun,
m_scene.RegionInfo.RegionSettings.Covenant,
m_scene.RegionInfo.EstateSettings.AbuseEmail);
m_scene.RegionInfo.EstateSettings.AbuseEmail,
estateOwner);
remote_client.SendEstateManagersList(invoice,
m_scene.RegionInfo.EstateSettings.EstateManagers,