aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/RegionInfo.cs
diff options
context:
space:
mode:
authorMW2007-04-04 19:55:31 +0000
committerMW2007-04-04 19:55:31 +0000
commit0a377238f8e645f708b67bca1d6bb7ce879bd4a4 (patch)
tree01c70b1ce5c6f34e6716bec9c7878b8dbc5b9133 /OpenSim.RegionServer/RegionInfo.cs
parentno SimUUID in OpenSimMain (diff)
downloadopensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.zip
opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.gz
opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.bz2
opensim-SC_OLD-0a377238f8e645f708b67bca1d6bb7ce879bd4a4.tar.xz
more work on Primitive2
Diffstat (limited to 'OpenSim.RegionServer/RegionInfo.cs')
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs33
1 files changed, 16 insertions, 17 deletions
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
9{ 9{
10 public class RegionInfo // could inherit from SimProfileBase 10 public class RegionInfo // could inherit from SimProfileBase
11 { 11 {
12 public LLUUID SimUUID;
12 public string RegionName; 13 public string RegionName;
13 public LLUUID SimUUID;
14
15 public uint RegionLocX; 14 public uint RegionLocX;
16 public uint RegionLocY; 15 public uint RegionLocY;
17 public ulong RegionHandle; 16 public ulong RegionHandle;
@@ -42,21 +41,21 @@ namespace OpenSim
42 this.isSandbox = sandboxMode; 41 this.isSandbox = sandboxMode;
43 try 42 try
44 { 43 {
45 // Sim UUID 44 // Sim UUID
46 string attri =""; 45 string attri = "";
47 attri = configData.GetAttribute("SimUUID"); 46 attri = configData.GetAttribute("SimUUID");
48 if (attri == "") 47 if (attri == "")
49 { 48 {
50 this.SimUUID = LLUUID.Random(); 49 this.SimUUID = LLUUID.Random();
51 configData.SetAttribute("SimUUID", this.SimUUID.ToString()); 50 configData.SetAttribute("SimUUID", this.SimUUID.ToString());
52 } 51 }
53 else 52 else
54 { 53 {
55 this.SimUUID = new LLUUID(attri); 54 this.SimUUID = new LLUUID(attri);
56 } 55 }
57 56
58 // Sim name 57 // Sim name
59 attri =""; 58 attri = "";
60 attri = configData.GetAttribute("SimName"); 59 attri = configData.GetAttribute("SimName");
61 if (attri == "") 60 if (attri == "")
62 { 61 {
@@ -116,7 +115,7 @@ namespace OpenSim
116 } 115 }
117 else 116 else
118 { 117 {
119 this.IPListenAddr = attri; 118 this.IPListenAddr = attri;
120 } 119 }
121 120
122 if (!isSandbox) 121 if (!isSandbox)
@@ -231,7 +230,7 @@ namespace OpenSim
231 230
232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); 231 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:");
233 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated()); 232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated());
234 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); 233 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
235 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 234 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
236 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); 235 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString());
237 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); 236 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);