aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-03-22 10:43:43 +0100
committerMelanie2011-03-22 10:43:43 +0100
commitc330f89fb1954ba2a784cd5bc421965b7594d60c (patch)
treeae00576857798df9a4a6495b6e5bad83c47487ed
parentAdding a helper function lifted from Aurora. Not for core. (diff)
downloadopensim-SC_OLD-c330f89fb1954ba2a784cd5bc421965b7594d60c.zip
opensim-SC_OLD-c330f89fb1954ba2a784cd5bc421965b7594d60c.tar.gz
opensim-SC_OLD-c330f89fb1954ba2a784cd5bc421965b7594d60c.tar.bz2
opensim-SC_OLD-c330f89fb1954ba2a784cd5bc421965b7594d60c.tar.xz
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.
-rw-r--r--OpenSim/Data/IRegionData.cs3
-rw-r--r--OpenSim/Framework/EstateSettings.cs24
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs21
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateModule.cs2
4 files changed, 45 insertions, 5 deletions
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index d21a312..46dc4fb 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -77,8 +77,7 @@ namespace OpenSim.Data
77 NoMove = 64, // Don't allow moving this region 77 NoMove = 64, // Don't allow moving this region
78 Reservation = 128, // This is an inactive reservation 78 Reservation = 128, // This is an inactive reservation
79 Authenticate = 256, // Require authentication 79 Authenticate = 256, // Require authentication
80 Hyperlink = 512, // Record represents a HG link 80 Hyperlink = 512 // Record represents a HG link
81 NoTraffic = 512 // Exclude this sim from traffic reporting
82 } 81 }
83 82
84 public class RegionDataDistanceCompare : IComparer<RegionData> 83 public class RegionDataDistanceCompare : IComparer<RegionData>
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 37f6ed7..afbdd49 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,6 +58,30 @@ namespace OpenSim.Framework
58 set { m_EstateName = value; } 58 set { m_EstateName = value; }
59 } 59 }
60 60
61 private bool m_AllowLandmark = true;
62
63 public bool AllowLandmark
64 {
65 get { return m_AllowLandmark; }
66 set { m_AllowLandmark = value; }
67 }
68
69 private bool m_AllowParcelChanges = true;
70
71 public bool AllowParcelChanges
72 {
73 get { return m_AllowParcelChanges; }
74 set { m_AllowParcelChanges = value; }
75 }
76
77 private bool m_AllowSetHome = true;
78
79 public bool AllowSetHome
80 {
81 get { return m_AllowSetHome; }
82 set { m_AllowSetHome = value; }
83 }
84
61 private uint m_ParentEstateID = 1; 85 private uint m_ParentEstateID = 1;
62 86
63 public uint ParentEstateID 87 public uint ParentEstateID
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 34d0cfc..c146b72 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -380,7 +380,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
380 { 380 {
381 remote_client.SendAlertMessage("User is already on the region ban list"); 381 remote_client.SendAlertMessage("User is already on the region ban list");
382 } 382 }
383 //m_scene.RegionInfo.regionBanlist.Add(Manager(user); 383 //Scene.RegionInfo.regionBanlist.Add(Manager(user);
384 remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID); 384 remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
385 } 385 }
386 else 386 else
@@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
418 remote_client.SendAlertMessage("User is not on the region ban list"); 418 remote_client.SendAlertMessage("User is not on the region ban list");
419 } 419 }
420 420
421 //m_scene.RegionInfo.regionBanlist.Add(Manager(user); 421 //Scene.RegionInfo.regionBanlist.Add(Manager(user);
422 remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID); 422 remote_client.SendBannedUserList(invoice, Scene.RegionInfo.EstateSettings.EstateBans, Scene.RegionInfo.EstateSettings.EstateID);
423 } 423 }
424 else 424 else
@@ -784,7 +784,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
784 784
785 for (int i = 0; i < uuidarr.Length; i++) 785 for (int i = 0; i < uuidarr.Length; i++)
786 { 786 {
787 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); 787 // string lookupname = Scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
788 788
789 IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>(); 789 IUserManagement userManager = Scene.RequestModuleInterface<IUserManagement>();
790 if (userManager != null) 790 if (userManager != null)
@@ -1031,6 +1031,15 @@ namespace OpenSim.Region.CoreModules.World.Estate
1031 flags |= RegionFlags.Sandbox; 1031 flags |= RegionFlags.Sandbox;
1032 if (Scene.RegionInfo.EstateSettings.AllowVoice) 1032 if (Scene.RegionInfo.EstateSettings.AllowVoice)
1033 flags |= RegionFlags.AllowVoice; 1033 flags |= RegionFlags.AllowVoice;
1034 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1035 flags |= RegionFlags.AllowLandmark;
1036 if (Scene.RegionInfo.EstateSettings.AllowSetHome)
1037 flags |= RegionFlags.AllowSetHome;
1038 if (Scene.RegionInfo.EstateSettings.BlockDwell)
1039 flags |= RegionFlags.BlockDwell;
1040 if (Scene.RegionInfo.EstateSettings.ResetHomeOnTeleport)
1041 flags |= RegionFlags.ResetHomeOnTeleport;
1042
1034 1043
1035 // Fudge these to always on, so the menu options activate 1044 // Fudge these to always on, so the menu options activate
1036 // 1045 //
@@ -1076,6 +1085,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
1076 flags |= RegionFlags.ResetHomeOnTeleport; 1085 flags |= RegionFlags.ResetHomeOnTeleport;
1077 if (Scene.RegionInfo.EstateSettings.TaxFree) 1086 if (Scene.RegionInfo.EstateSettings.TaxFree)
1078 flags |= RegionFlags.TaxFree; 1087 flags |= RegionFlags.TaxFree;
1088 if (Scene.RegionInfo.EstateSettings.AllowLandmark)
1089 flags |= RegionFlags.AllowLandmark;
1090 if (Scene.RegionInfo.EstateSettings.AllowParcelChanges)
1091 flags |= RegionFlags.AllowParcelChanges;
1092 if (Scene.RegionInfo.EstateSettings.AllowSetHome)
1093 flags |= RegionFlags.AllowSetHome;
1079 if (Scene.RegionInfo.EstateSettings.DenyMinors) 1094 if (Scene.RegionInfo.EstateSettings.DenyMinors)
1080 flags |= (RegionFlags)(1 << 30); 1095 flags |= (RegionFlags)(1 << 30);
1081 1096
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 721f0ee..72e79ed 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -45,5 +45,7 @@ namespace OpenSim.Region.Framework.Interfaces
45 /// Tell all clients about the current state of the region (terrain textures, water height, etc.). 45 /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
46 /// </summary> 46 /// </summary>
47 void sendRegionHandshakeToAll(); 47 void sendRegionHandshakeToAll();
48 void TriggerEstateInfoChange();
49 void TriggerRegionInfoChange();
48 } 50 }
49} 51}