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

more to go

Browse Source
This commit is contained in:
UbitUmarov
2020-06-18 13:18:08 +01:00
parent 6cb2cb40cc
commit f708b413a1
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/EstateSettings.cs
View File

@@ -240,8 +240,8 @@ namespace OpenSim.Framework
set { m_DenyMinors = value; }
}
private bool m_AllowEnviromentOverride = false;
public bool AllowEnviromentOverride
private bool m_AllowEnviromentOverride = false; //keep the mispell so not to go change the dbs
public bool AllowEnvironmentOverride
{
get { return m_AllowEnviromentOverride; }
set { m_AllowEnviromentOverride = value; }

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -867,7 +867,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (Scene.RegionInfo.EstateSettings.DenyMinors)
flags |= RegionFlags.DenyAgeUnverified;
if(Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
if(Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
flags |= RegionFlags.AllowEnviromentOverride;
return (uint)flags;
}

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

@@ -180,7 +180,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
flags |= RegionFlags.ResetHomeOnTeleport;
if (Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
flags |= RegionFlags.AllowEnviromentOverride;
// TODO: SkipUpdateInterestList
@@ -1523,7 +1523,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
public void handleEstateChangeInfo(IClientAPI remoteClient, UUID invoice, UUID senderID, UInt32 parms1, UInt32 parms2)
{
bool lastallowEnvOvr = Scene.RegionInfo.EstateSettings.AllowEnviromentOverride;
bool lastallowEnvOvr = Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride;
if ((parms1 & 0x00008000) != 0)
Scene.RegionInfo.EstateSettings.PublicAccess = true;
@@ -1537,9 +1537,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
Scene.RegionInfo.EstateSettings.TaxFree = true;
if ((parms1 & 0x00000200) != 0)
Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = true;
Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride = true;
else
Scene.RegionInfo.EstateSettings.AllowEnviromentOverride = false;
Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride = false;
if ((parms1 & 0x00100000) != 0)
Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
@@ -1575,9 +1575,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
if (lastallowEnvOvr && Scene.LandChannel != null && !Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
if (lastallowEnvOvr && Scene.LandChannel != null && !Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
{
Scene.ClearAllParcelEnviroments();
Scene.ClearAllParcelEnvironments();
}
TriggerEstateInfoChange();
@@ -1590,9 +1590,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
bool allowDirectTeleport,
bool denyAnonymous, bool denyAgeUnverified,
bool alloVoiceChat, bool overridePublicAccess,
bool allowEnviromentOverride)
bool allowEnvironmentOverride)
{
bool lastallowEnvOvr = Scene.RegionInfo.EstateSettings.AllowEnviromentOverride;
bool lastallowEnvOvr = Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride;
Scene.RegionInfo.EstateSettings.PublicAccess = externallyVisible;
Scene.RegionInfo.EstateSettings.AllowDirectTeleport = allowDirectTeleport;
@@ -1603,11 +1603,11 @@ 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.RegionInfo.EstateSettings.AllowEnvironmentOverride = allowEnvironmentOverride;
Scene.EstateDataService.StoreEstateSettings(Scene.RegionInfo.EstateSettings);
if(lastallowEnvOvr && !allowEnviromentOverride)
Scene.ClearAllParcelEnviroments();
if(lastallowEnvOvr && !allowEnvironmentOverride)
Scene.ClearAllParcelEnvironments();
TriggerEstateInfoChange();
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (Scene.RegionInfo.EstateSettings.DenyMinors)
flags |= RegionFlags.DenyAgeUnverified;
if (Scene.RegionInfo.EstateSettings.AllowEnviromentOverride)
if (Scene.RegionInfo.EstateSettings.AllowEnvironmentOverride)
flags |= RegionFlags.AllowEnviromentOverride;
return (uint)flags;