aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs21
-rw-r--r--OpenSim/Region/Framework/Interfaces/IEstateModule.cs2
2 files changed, 20 insertions, 3 deletions
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}