aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/RegionInfo.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs70
1 files changed, 3 insertions, 67 deletions
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index 76f05b6..d148d0f 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -7,22 +7,13 @@ using System.IO;
7using OpenSim.Framework.Interfaces; 7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Utilities; 8using OpenSim.Framework.Utilities;
9using libsecondlife; 9using libsecondlife;
10using OpenSim.Framework.Types;
10 11
11namespace OpenSim 12namespace OpenSim
12{ 13{
13 public class RegionInfo : RegionInfoBase 14 public class RegionInfo : RegionInfoBase
14 { 15 {
15 //following should be removed and the GenericConfig object passed around, 16
16 //so each class (AssetServer, GridServer etc) can access what config data they want
17 public string AssetURL = "http://127.0.0.1:8003/";
18 public string AssetSendKey = "";
19
20 public string GridURL = "";
21 public string GridSendKey = "";
22 public string GridRecvKey = "";
23 public string UserURL = "";
24 public string UserSendKey = "";
25 public string UserRecvKey = "";
26 private bool isSandbox; 17 private bool isSandbox;
27 18
28 public string DataStore; 19 public string DataStore;
@@ -129,62 +120,7 @@ namespace OpenSim
129 this.IPListenAddr = attri; 120 this.IPListenAddr = attri;
130 } 121 }
131 122
132 if (!isSandbox) 123
133 {
134 //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object
135
136 //Grid Server URL
137 attri = "";
138 attri = configData.GetAttribute("GridServerURL");
139 if (attri == "")
140 {
141 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
142 configData.SetAttribute("GridServerURL", this.GridURL);
143 }
144 else
145 {
146 this.GridURL = attri;
147 }
148
149 //Grid Send Key
150 attri = "";
151 attri = configData.GetAttribute("GridSendKey");
152 if (attri == "")
153 {
154 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
155 configData.SetAttribute("GridSendKey", this.GridSendKey);
156 }
157 else
158 {
159 this.GridSendKey = attri;
160 }
161
162 //Grid Receive Key
163 attri = "";
164 attri = configData.GetAttribute("GridRecvKey");
165 if (attri == "")
166 {
167 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
168 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
169 }
170 else
171 {
172 this.GridRecvKey = attri;
173 }
174
175 attri = "";
176 attri = configData.GetAttribute("AssetServerURL");
177 if (attri == "")
178 {
179 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
180 configData.SetAttribute("AssetServerURL", this.GridURL);
181 }
182 else
183 {
184 this.AssetURL = attri;
185 }
186
187 }
188 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); 124 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
189 125
190 configData.Commit(); 126 configData.Commit();