diff options
author | gareth | 2007-04-04 18:57:13 +0000 |
---|---|---|
committer | gareth | 2007-04-04 18:57:13 +0000 |
commit | f741e00ad8b87485d98e8bca82e4256cb30615d1 (patch) | |
tree | 3b82325fe68cae9a6a640547937217b6b270a179 /OpenSim.RegionServer/RegionInfo.cs | |
parent | Deleted OpenSim.Config/SimConfigDb4o, as it hasn't been used for a while now. (diff) | |
download | opensim-SC-f741e00ad8b87485d98e8bca82e4256cb30615d1.zip opensim-SC-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.gz opensim-SC-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.bz2 opensim-SC-f741e00ad8b87485d98e8bca82e4256cb30615d1.tar.xz |
Added SimUUID
Added empty POST for /sims in REST on gridserver
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/RegionInfo.cs | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs index 806d7cc..15998cf 100644 --- a/OpenSim.RegionServer/RegionInfo.cs +++ b/OpenSim.RegionServer/RegionInfo.cs | |||
@@ -3,12 +3,14 @@ using System.Collections.Generic; | |||
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.Framework.Interfaces; | 4 | using OpenSim.Framework.Interfaces; |
5 | using OpenSim.Framework.Utilities; | 5 | using OpenSim.Framework.Utilities; |
6 | using libsecondlife; | ||
6 | 7 | ||
7 | namespace OpenSim | 8 | namespace OpenSim |
8 | { | 9 | { |
9 | public class RegionInfo // could inherit from SimProfileBase | 10 | public class RegionInfo // could inherit from SimProfileBase |
10 | { | 11 | { |
11 | public string RegionName; | 12 | public string RegionName; |
13 | public LLUUID SimUUID; | ||
12 | 14 | ||
13 | public uint RegionLocX; | 15 | public uint RegionLocX; |
14 | public uint RegionLocY; | 16 | public uint RegionLocY; |
@@ -40,8 +42,21 @@ namespace OpenSim | |||
40 | this.isSandbox = sandboxMode; | 42 | this.isSandbox = sandboxMode; |
41 | try | 43 | try |
42 | { | 44 | { |
45 | // Sim UUID | ||
46 | string attri =""; | ||
47 | attri = configData.GetAttribute("SimUUID"); | ||
48 | if (attri == "") | ||
49 | { | ||
50 | this.SimUUID = LLUUID.Random(); | ||
51 | configData.SetAttribute("SimUUID", this.SimUUID.ToString()); | ||
52 | } | ||
53 | else | ||
54 | { | ||
55 | this.SimUUID = new LLUUID(attri); | ||
56 | } | ||
57 | |||
43 | // Sim name | 58 | // Sim name |
44 | string attri =""; | 59 | attri =""; |
45 | attri = configData.GetAttribute("SimName"); | 60 | attri = configData.GetAttribute("SimName"); |
46 | if (attri == "") | 61 | if (attri == "") |
47 | { | 62 | { |
@@ -215,7 +230,8 @@ namespace OpenSim | |||
215 | } | 230 | } |
216 | 231 | ||
217 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); | 232 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:"); |
218 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); | 233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("UUID: " + this.SimUUID.ToStringHyphenated()); |
234 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName); | ||
219 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); | 235 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); |
220 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); | 236 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString()); |
221 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); | 237 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); |