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

Add some more fields to Estate settings and make them work. 

Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
avinationmerge
Melanie 2011-03-22 10:43:43 +01:00
parent 3cfaf4c225
commit c330f89fb1
4 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/IRegionData.cs
View File

@ -77,8 +77,7 @@ namespace OpenSim.Data
NoMove = 64, // Don't allow moving this region NoMove = 64, // Don't allow moving this region
Reservation = 128, // This is an inactive reservation Reservation = 128, // This is an inactive reservation
Authenticate = 256, // Require authentication Authenticate = 256, // Require authentication
Hyperlink = 512, // Record represents a HG link Hyperlink = 512 // Record represents a HG link
NoTraffic = 512 // Exclude this sim from traffic reporting
} }
public class RegionDataDistanceCompare : IComparer<RegionData> public class RegionDataDistanceCompare : IComparer<RegionData>

24
OpenSim/Framework/EstateSettings.cs
View File

@ -58,6 +58,30 @@ namespace OpenSim.Framework
set { m_EstateName = value; } set { m_EstateName = value; }
} }
private bool m_AllowLandmark = true;
public bool AllowLandmark
{
get { return m_AllowLandmark; }
set { m_AllowLandmark = value; }
}
private bool m_AllowParcelChanges = true;
public bool AllowParcelChanges
{
get { return m_AllowParcelChanges; }
set { m_AllowParcelChanges = value; }
}
private bool m_AllowSetHome = true;
public bool AllowSetHome
{
get { return m_AllowSetHome; }
set { m_AllowSetHome = value; }
}
private uint m_ParentEstateID = 1; private uint m_ParentEstateID = 1;
public uint ParentEstateID public uint ParentEstateID

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

@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
{ {
remote_client.SendAlertMessage("User is already on the region ban list"); remote_client.SendAlertMessage("User is already on the region ban list");
} }
//m_scene.RegionInfo.regionBanlist.Add(Manager(user); //Scene.RegionInfo.regionBanlist.Add(Manager(user);
remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID); remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
} }
else else
@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
remote_client.SendAlertMessage("User is not on the region ban list"); remote_client.SendAlertMessage("User is not on the region ban list");
} }
//m_scene.RegionInfo.regionBanlist.Add(Manager(user); //Scene.RegionInfo.regionBanlist.Add(Manager(user);
remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID); remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
} }
else else
@ -784,7 +784,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
for (int i = 0; i < uuidarr.Length; i++) for (int i = 0; i < uuidarr.Length; i++)
{ {
// string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); // string lookupname = Scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>(); IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>();
if (userManager != null) if (userManager != null)
@ -1031,6 +1031,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
flags |= RegionFlags.Sandbox; flags |= RegionFlags.Sandbox;
if (Scene.RegionInfo.EstateSettings.AllowVoice) if (Scene.RegionInfo.EstateSettings.AllowVoice)
flags |= RegionFlags.AllowVoice; flags |= RegionFlags.AllowVoice;
if (Scene.RegionInfo.EstateSettings.AllowLandmark)
flags |= RegionFlags.AllowLandmark;
if (Scene.RegionInfo.EstateSettings.AllowSetHome)
flags |= RegionFlags.AllowSetHome;
if (Scene.RegionInfo.EstateSettings.BlockDwell)
flags |= RegionFlags.BlockDwell;
if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
flags |= RegionFlags.ResetHomeOnTeleport;
// Fudge these to always on, so the menu options activate // Fudge these to always on, so the menu options activate
// //
@ -1076,6 +1085,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
flags |= RegionFlags.ResetHomeOnTeleport; flags |= RegionFlags.ResetHomeOnTeleport;
if (Scene.RegionInfo.EstateSettings.TaxFree) if (Scene.RegionInfo.EstateSettings.TaxFree)
flags |= RegionFlags.TaxFree; flags |= RegionFlags.TaxFree;
if (Scene.RegionInfo.EstateSettings.AllowLandmark)
flags |= RegionFlags.AllowLandmark;
if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
flags |= RegionFlags.AllowParcelChanges;
if (Scene.RegionInfo.EstateSettings.AllowSetHome)
flags |= RegionFlags.AllowSetHome;
if (Scene.RegionInfo.EstateSettings.DenyMinors) if (Scene.RegionInfo.EstateSettings.DenyMinors)
flags |= (RegionFlags)(1 << 30); flags |= (RegionFlags)(1 << 30);

2
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
View File

@ -45,5 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// Tell all clients about the current state of the region (terrain textures, water height, etc.). /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
/// </summary> /// </summary>
void sendRegionHandshakeToAll(); void sendRegionHandshakeToAll();
void TriggerEstateInfoChange();
void TriggerRegionInfoChange();
} }
} }