aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorCareminster Staff2010-01-18 16:23:13 -0600
committerMelanie2010-01-19 01:46:50 +0000
commit24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6 (patch)
treeb865a9ee3398bfe24b7fb30897cf30bec2a2da2a /OpenSim
parentComment the asset deletion handler. It can be abused and is not currently (diff)
downloadopensim-SC-24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6.zip
opensim-SC-24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6.tar.gz
opensim-SC-24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6.tar.bz2
opensim-SC-24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6.tar.xz
Adds example to OpenSim.ini.example for Admin Default Parcel settings
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 6a0e8d1..28669b9 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Land
81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; 81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
82 82
83 private bool m_allowedForcefulBans = true; 83 private bool m_allowedForcefulBans = true;
84 private string DefaultGodParcelGroup; 84 private UUID DefaultGodParcelGroup;
85 private string DefaultGodParcelName; 85 private string DefaultGodParcelName;
86 86
87 // caches ExtendedLandData 87 // caches ExtendedLandData
@@ -96,6 +96,12 @@ namespace OpenSim.Region.CoreModules.World.Land
96 96
97 public void Initialise(IConfigSource source) 97 public void Initialise(IConfigSource source)
98 { 98 {
99 IConfig cnf = source.Configs["LandManagement"];
100 if (cnf == null)
101 {
102 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
103 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
104 }
99 } 105 }
100 106
101 public void AddRegion(Scene scene) 107 public void AddRegion(Scene scene)
@@ -1566,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1566 land = landObject; 1572 land = landObject;
1567 } 1573 }
1568 } 1574 }
1569 land.DeedToGroup(new UUID(DefaultGodParcelGroup)); 1575 land.DeedToGroup(DefaultGodParcelGroup);
1570 land.LandData.Name = DefaultGodParcelName; 1576 land.LandData.Name = DefaultGodParcelName;
1571 land.SendLandUpdateToAvatarsOverMe(); 1577 land.SendLandUpdateToAvatarsOverMe();
1572 } 1578 }