From 24056dc98ba94b32ac98cc0a3b1b85d5f8ef3de6 Mon Sep 17 00:00:00 2001
From: Careminster Staff
Date: Mon, 18 Jan 2010 16:23:13 -0600
Subject: Adds example to OpenSim.ini.example for Admin Default Parcel settings

---
 OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

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
         private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
 
         private bool m_allowedForcefulBans = true;
-        private string DefaultGodParcelGroup;
+        private UUID DefaultGodParcelGroup;
         private string DefaultGodParcelName;
 
         // caches ExtendedLandData
@@ -96,6 +96,12 @@ namespace OpenSim.Region.CoreModules.World.Land
 
         public void Initialise(IConfigSource source)
         {
+            IConfig cnf = source.Configs["LandManagement"];
+            if (cnf == null)
+            {
+                DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
+                DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
+            }
         }
 
         public void AddRegion(Scene scene)
@@ -1566,7 +1572,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                     land = landObject;
                 }
             }
-            land.DeedToGroup(new UUID(DefaultGodParcelGroup));
+            land.DeedToGroup(DefaultGodParcelGroup);
             land.LandData.Name = DefaultGodParcelName;
             land.SendLandUpdateToAvatarsOverMe();
         }
-- 
cgit v1.1