From 0a377238f8e645f708b67bca1d6bb7ce879bd4a4 Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 4 Apr 2007 19:55:31 +0000 Subject: more work on Primitive2 --- OpenSim.RegionServer/RegionInfo.cs | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'OpenSim.RegionServer/RegionInfo.cs') diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs index 15998cf..cf0c075 100644 --- a/OpenSim.RegionServer/RegionInfo.cs +++ b/OpenSim.RegionServer/RegionInfo.cs @@ -9,9 +9,8 @@ namespace OpenSim { public class RegionInfo // could inherit from SimProfileBase { + public LLUUID SimUUID; public string RegionName; - public LLUUID SimUUID; - public uint RegionLocX; public uint RegionLocY; public ulong RegionHandle; @@ -42,21 +41,21 @@ namespace OpenSim this.isSandbox = sandboxMode; try { - // Sim UUID - string attri =""; - attri = configData.GetAttribute("SimUUID"); - if (attri == "") - { - this.SimUUID = LLUUID.Random(); - configData.SetAttribute("SimUUID", this.SimUUID.ToString()); - } - else - { - this.SimUUID = new LLUUID(attri); - } + // Sim UUID + string attri = ""; + attri = configData.GetAttribute("SimUUID"); + if (attri == "") + { + this.SimUUID = LLUUID.Random(); + configData.SetAttribute("SimUUID", this.SimUUID.ToString()); + } + else + { + this.SimUUID = new LLUUID(attri); + } // Sim name - attri =""; + attri = ""; attri = configData.GetAttribute("SimName"); if (attri == "") { @@ -116,7 +115,7 @@ namespace OpenSim } else { - this.IPListenAddr = attri; + this.IPListenAddr = attri; } if (!isSandbox) @@ -231,7 +230,7 @@ namespace OpenSim OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated()); - OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); -- cgit v1.1