OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reassign estate setting TaxFree to the role of AllowAccessOverride, as viewers did. Keeping name to reuse dbs entries, etc. let viewers change it, but still NOP

httptests
UbitUmarov 2018-06-19 01:18:18 +01:00
parent 9b87626cdb
commit c53658248a
2 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Framework/EstateSettings.cs
View File

@ -44,7 +44,6 @@ namespace OpenSim.Framework
// Only the client uses these // Only the client uses these
// //
private uint m_EstateID = 0; private uint m_EstateID = 0;
public uint EstateID public uint EstateID
{ {
get { return m_EstateID; } get { return m_EstateID; }
@ -52,7 +51,6 @@ namespace OpenSim.Framework
} }
private string m_EstateName = "My Estate"; private string m_EstateName = "My Estate";
public string EstateName public string EstateName
{ {
get { return m_EstateName; } get { return m_EstateName; }
@ -60,7 +58,6 @@ namespace OpenSim.Framework
} }
private bool m_AllowLandmark = true; private bool m_AllowLandmark = true;
public bool AllowLandmark public bool AllowLandmark
{ {
get { return m_AllowLandmark; } get { return m_AllowLandmark; }
@ -68,7 +65,6 @@ namespace OpenSim.Framework
} }
private bool m_AllowParcelChanges = true; private bool m_AllowParcelChanges = true;
public bool AllowParcelChanges public bool AllowParcelChanges
{ {
get { return m_AllowParcelChanges; } get { return m_AllowParcelChanges; }
@ -76,7 +72,6 @@ namespace OpenSim.Framework
} }
private bool m_AllowSetHome = true; private bool m_AllowSetHome = true;
public bool AllowSetHome public bool AllowSetHome
{ {
get { return m_AllowSetHome; } get { return m_AllowSetHome; }
@ -84,7 +79,6 @@ namespace OpenSim.Framework
} }
private uint m_ParentEstateID = 1; private uint m_ParentEstateID = 1;
public uint ParentEstateID public uint ParentEstateID
{ {
get { return m_ParentEstateID; } get { return m_ParentEstateID; }
@ -92,7 +86,6 @@ namespace OpenSim.Framework
} }
private float m_BillableFactor = 0.0f; private float m_BillableFactor = 0.0f;
public float BillableFactor public float BillableFactor
{ {
get { return m_BillableFactor; } get { return m_BillableFactor; }
@ -100,7 +93,6 @@ namespace OpenSim.Framework
} }
private int m_PricePerMeter = 1; private int m_PricePerMeter = 1;
public int PricePerMeter public int PricePerMeter
{ {
get { return m_PricePerMeter; } get { return m_PricePerMeter; }
@ -108,7 +100,6 @@ namespace OpenSim.Framework
} }
private int m_RedirectGridX = 0; private int m_RedirectGridX = 0;
public int RedirectGridX public int RedirectGridX
{ {
get { return m_RedirectGridX; } get { return m_RedirectGridX; }
@ -116,7 +107,6 @@ namespace OpenSim.Framework
} }
private int m_RedirectGridY = 0; private int m_RedirectGridY = 0;
public int RedirectGridY public int RedirectGridY
{ {
get { return m_RedirectGridY; } get { return m_RedirectGridY; }
@ -126,7 +116,6 @@ namespace OpenSim.Framework
// Used by the sim // Used by the sim
// //
private bool m_UseGlobalTime = true; private bool m_UseGlobalTime = true;
public bool UseGlobalTime public bool UseGlobalTime
{ {
get { return m_UseGlobalTime; } get { return m_UseGlobalTime; }
@ -134,7 +123,6 @@ namespace OpenSim.Framework
} }
private bool m_FixedSun = false; private bool m_FixedSun = false;
public bool FixedSun public bool FixedSun
{ {
get { return m_FixedSun; } get { return m_FixedSun; }
@ -142,7 +130,6 @@ namespace OpenSim.Framework
} }
private double m_SunPosition = 0.0; private double m_SunPosition = 0.0;
public double SunPosition public double SunPosition
{ {
get { return m_SunPosition; } get { return m_SunPosition; }
@ -150,7 +137,6 @@ namespace OpenSim.Framework
} }
private bool m_AllowVoice = true; private bool m_AllowVoice = true;
public bool AllowVoice public bool AllowVoice
{ {
get { return m_AllowVoice; } get { return m_AllowVoice; }
@ -158,7 +144,6 @@ namespace OpenSim.Framework
} }
private bool m_AllowDirectTeleport = true; private bool m_AllowDirectTeleport = true;
public bool AllowDirectTeleport public bool AllowDirectTeleport
{ {
get { return m_AllowDirectTeleport; } get { return m_AllowDirectTeleport; }
@ -166,23 +151,22 @@ namespace OpenSim.Framework
} }
private bool m_DenyAnonymous = false; private bool m_DenyAnonymous = false;
public bool DenyAnonymous public bool DenyAnonymous
{ {
get { return m_DenyAnonymous; } get { return m_DenyAnonymous; }
set { m_DenyAnonymous = value; } set { m_DenyAnonymous = value; }
} }
// no longer in used, may be reassigned
private bool m_DenyIdentified = false; private bool m_DenyIdentified = false;
public bool DenyIdentified public bool DenyIdentified
{ {
get { return m_DenyIdentified; } get { return m_DenyIdentified; }
set { m_DenyIdentified = value; } set { m_DenyIdentified = value; }
} }
// no longer in used, may be reassigned
private bool m_DenyTransacted = false; private bool m_DenyTransacted = false;
public bool DenyTransacted public bool DenyTransacted
{ {
get { return m_DenyTransacted; } get { return m_DenyTransacted; }
@ -190,7 +174,6 @@ namespace OpenSim.Framework
} }
private bool m_AbuseEmailToEstateOwner = false; private bool m_AbuseEmailToEstateOwner = false;
public bool AbuseEmailToEstateOwner public bool AbuseEmailToEstateOwner
{ {
get { return m_AbuseEmailToEstateOwner; } get { return m_AbuseEmailToEstateOwner; }
@ -198,7 +181,6 @@ namespace OpenSim.Framework
} }
private bool m_BlockDwell = false; private bool m_BlockDwell = false;
public bool BlockDwell public bool BlockDwell
{ {
get { return m_BlockDwell; } get { return m_BlockDwell; }
@ -206,7 +188,6 @@ namespace OpenSim.Framework
} }
private bool m_EstateSkipScripts = false; private bool m_EstateSkipScripts = false;
public bool EstateSkipScripts public bool EstateSkipScripts
{ {
get { return m_EstateSkipScripts; } get { return m_EstateSkipScripts; }
@ -214,7 +195,6 @@ namespace OpenSim.Framework
} }
private bool m_ResetHomeOnTeleport = false; private bool m_ResetHomeOnTeleport = false;
public bool ResetHomeOnTeleport public bool ResetHomeOnTeleport
{ {
get { return m_ResetHomeOnTeleport; } get { return m_ResetHomeOnTeleport; }
@ -222,15 +202,13 @@ namespace OpenSim.Framework
} }
private bool m_TaxFree = false; private bool m_TaxFree = false;
public bool TaxFree // this is now AllowAccessOverride, keeping same name to reuse DB entries
public bool TaxFree
{ {
get { return m_TaxFree; } get { return m_TaxFree; }
set { m_TaxFree = value; } set { m_TaxFree = value; }
} }
private bool m_PublicAccess = true; private bool m_PublicAccess = true;
public bool PublicAccess public bool PublicAccess
{ {
get { return m_PublicAccess; } get { return m_PublicAccess; }

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

@ -1556,20 +1556,21 @@ namespace OpenSim.Region.CoreModules.World.Estate
// Warning: FixedSun should be set to True, otherwise this sun position won't be used. // Warning: FixedSun should be set to True, otherwise this sun position won't be used.
} }
if ((parms1 & 0x00000010) != 0)
Scene.RegionInfo.EstateSettings.FixedSun = true;
else
Scene.RegionInfo.EstateSettings.FixedSun = false;
if ((parms1 & 0x00008000) != 0) if ((parms1 & 0x00008000) != 0)
Scene.RegionInfo.EstateSettings.PublicAccess = true; Scene.RegionInfo.EstateSettings.PublicAccess = true;
else else
Scene.RegionInfo.EstateSettings.PublicAccess = false; Scene.RegionInfo.EstateSettings.PublicAccess = false;
if ((parms1 & 0x10000000) != 0) if ((parms1 & 0x00000010) != 0)
Scene.RegionInfo.EstateSettings.AllowVoice = true; Scene.RegionInfo.EstateSettings.FixedSun = true;
else else
Scene.RegionInfo.EstateSettings.AllowVoice = false; Scene.RegionInfo.EstateSettings.FixedSun = false;
// taxfree is now AllowAccessOverride
if ((parms1 & 0x00000020) != 0)
Scene.RegionInfo.EstateSettings.TaxFree = true;
else
Scene.RegionInfo.EstateSettings.TaxFree = false;
if ((parms1 & 0x00100000) != 0) if ((parms1 & 0x00100000) != 0)
Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true; Scene.RegionInfo.EstateSettings.AllowDirectTeleport = true;
@ -1581,16 +1582,23 @@ namespace OpenSim.Region.CoreModules.World.Estate
else else
Scene.RegionInfo.EstateSettings.DenyAnonymous = false; Scene.RegionInfo.EstateSettings.DenyAnonymous = false;
// no longer in used, may be reassigned
if ((parms1 & 0x01000000) != 0) if ((parms1 & 0x01000000) != 0)
Scene.RegionInfo.EstateSettings.DenyIdentified = true; Scene.RegionInfo.EstateSettings.DenyIdentified = true;
else else
Scene.RegionInfo.EstateSettings.DenyIdentified = false; Scene.RegionInfo.EstateSettings.DenyIdentified = false;
// no longer in used, may be reassigned
if ((parms1 & 0x02000000) != 0) if ((parms1 & 0x02000000) != 0)
Scene.RegionInfo.EstateSettings.DenyTransacted = true; Scene.RegionInfo.EstateSettings.DenyTransacted = true;
else else
Scene.RegionInfo.EstateSettings.DenyTransacted = false; Scene.RegionInfo.EstateSettings.DenyTransacted = false;
if ((parms1 & 0x10000000) != 0)
Scene.RegionInfo.EstateSettings.AllowVoice = true;
else
Scene.RegionInfo.EstateSettings.AllowVoice = false;
if ((parms1 & 0x40000000) != 0) if ((parms1 & 0x40000000) != 0)
Scene.RegionInfo.EstateSettings.DenyMinors = true; Scene.RegionInfo.EstateSettings.DenyMinors = true;
else else