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

sync some more things with work copy

Browse Source
This commit is contained in:
UbitUmarov
2020-03-02 01:56:34 +00:00
parent 97cb6254ef
commit be16cf9531
7 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -183,6 +183,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
flags |= RegionFlags.ResetHomeOnTeleport;
if (Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
flags |= RegionFlags.AllowEnviromentOverride;
// TODO: SkipUpdateInterestList
@@ -1401,7 +1403,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
}
}
private void HandleRegionInfoRequest(IClientAPI remote_client)
public void HandleRegionInfoRequest(IClientAPI remote_client)
{
RegionInfoForEstateMenuArgs args = new RegionInfoForEstateMenuArgs();
args.billableFactor = Scene.RegionInfo.EstateSettings.BillableFactor;
@@ -1555,6 +1557,11 @@ namespace OpenSim.Region.CoreModules.World.Estate
else
Scene.RegionInfo.EstateSettings.TaxFree = true;
if ((parms1 & 0x00000200) != 0)
Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = true;
else
Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = false;
if ((parms1 & 0x00100000) != 0)
Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
else
@@ -1600,7 +1607,8 @@ namespace OpenSim.Region.CoreModules.World.Estate
bool externallyVisible,
bool allowDirectTeleport,
bool denyAnonymous, bool denyAgeUnverified,
bool alloVoiceChat, bool overridePublicAccess)
bool alloVoiceChat, bool overridePublicAccess,
bool allowEnviromentOverride)
{
if (sunHour == 0)
{
@@ -1624,6 +1632,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
// taxfree is now !AllowAccessOverride
Scene.RegionInfo.EstateSettings.TaxFree = overridePublicAccess;
Scene.RegionInfo.EstateSettings.DenyMinors = denyAgeUnverified;
Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = allowEnviromentOverride;
Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
TriggerEstateInfoChange();
@@ -1696,8 +1705,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.FixedSun)
flags |= RegionFlags.SunFixed;
if (!Scene.RegionInfo.EstateSettings.TaxFree) // this is now wrong means !ALLOW_ACCESS_OVERRIDE
flags |= RegionFlags.TaxFree;
flags |= RegionFlags.AllowParcelAccessOverride;
if(Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
flags |= RegionFlags.AllowEnviromentOverride;
if (Scene.RegionInfo.EstateSettings.PublicAccess) //??
flags |= (RegionFlags.PublicAllowed | RegionFlags.ExternallyVisible);

2
OpenSim/Region/CoreModules/World/Wind/WindModule.cs
View File

@@ -160,7 +160,7 @@ namespace OpenSim.Region.CoreModules
// Generate initial wind values
GenWind();
// hopefully this will not be the same for all regions on same instance
m_dataVersion = (int)m_scene.AllocateLocalId();
m_dataVersion = m_scene.AllocateIntId();
// Mark Module Ready for duty
m_ready = true;
}