aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs77
-rw-r--r--OpenSim/OpenSim.RegionServer/world/ParcelManager.cs8
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs36
3 files changed, 88 insertions, 33 deletions
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index d0ce1ce..6bd8f08 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -26,7 +26,10 @@ namespace OpenSim
26 public string UserRecvKey = ""; 26 public string UserRecvKey = "";
27 private bool isSandbox; 27 private bool isSandbox;
28 28
29 public string RegionOwnerName = ""; 29 public string MasterAvatarFirstName = "";
30 public string MasterAvatarLastName = "";
31 public string MasterAvatarSandboxPassword = "";
32 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
30 33
31 public string DataStore; 34 public string DataStore;
32 35
@@ -105,7 +108,7 @@ namespace OpenSim
105 attri = configData.GetAttribute("SimName"); 108 attri = configData.GetAttribute("SimName");
106 if (attri == "") 109 if (attri == "")
107 { 110 {
108 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test"); 111 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Simulator Name", "OpenSim Island");
109 configData.SetAttribute("SimName", this.RegionName); 112 configData.SetAttribute("SimName", this.RegionName);
110 } 113 }
111 else 114 else
@@ -117,7 +120,7 @@ namespace OpenSim
117 attri = configData.GetAttribute("SimLocationX"); 120 attri = configData.GetAttribute("SimLocationX");
118 if (attri == "") 121 if (attri == "")
119 { 122 {
120 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997"); 123 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Grid Location X", "997");
121 configData.SetAttribute("SimLocationX", location); 124 configData.SetAttribute("SimLocationX", location);
122 this.RegionLocX = (uint)Convert.ToUInt32(location); 125 this.RegionLocX = (uint)Convert.ToUInt32(location);
123 } 126 }
@@ -130,7 +133,7 @@ namespace OpenSim
130 attri = configData.GetAttribute("SimLocationY"); 133 attri = configData.GetAttribute("SimLocationY");
131 if (attri == "") 134 if (attri == "")
132 { 135 {
133 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996"); 136 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Grid Location Y", "996");
134 configData.SetAttribute("SimLocationY", location); 137 configData.SetAttribute("SimLocationY", location);
135 this.RegionLocY = (uint)Convert.ToUInt32(location); 138 this.RegionLocY = (uint)Convert.ToUInt32(location);
136 } 139 }
@@ -144,7 +147,7 @@ namespace OpenSim
144 attri = configData.GetAttribute("Datastore"); 147 attri = configData.GetAttribute("Datastore");
145 if (attri == "") 148 if (attri == "")
146 { 149 {
147 string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap"); 150 string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Filename for local world storage", "localworld.yap");
148 configData.SetAttribute("Datastore", datastore); 151 configData.SetAttribute("Datastore", datastore);
149 this.DataStore = datastore; 152 this.DataStore = datastore;
150 } 153 }
@@ -158,7 +161,7 @@ namespace OpenSim
158 attri = configData.GetAttribute("SimListenPort"); 161 attri = configData.GetAttribute("SimListenPort");
159 if (attri == "") 162 if (attri == "")
160 { 163 {
161 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000"); 164 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: UDP port for client connections", "9000");
162 configData.SetAttribute("SimListenPort", port); 165 configData.SetAttribute("SimListenPort", port);
163 this.IPListenPort = Convert.ToInt32(port); 166 this.IPListenPort = Convert.ToInt32(port);
164 } 167 }
@@ -171,7 +174,7 @@ namespace OpenSim
171 attri = configData.GetAttribute("SimListenAddress"); 174 attri = configData.GetAttribute("SimListenAddress");
172 if (attri == "") 175 if (attri == "")
173 { 176 {
174 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1"); 177 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: IP Address to listen on for client connections", "127.0.0.1");
175 configData.SetAttribute("SimListenAddress", this.IPListenAddr); 178 configData.SetAttribute("SimListenAddress", this.IPListenAddr);
176 } 179 }
177 else 180 else
@@ -202,7 +205,7 @@ namespace OpenSim
202 attri = configData.GetAttribute("TerrainFile"); 205 attri = configData.GetAttribute("TerrainFile");
203 if (attri == "") 206 if (attri == "")
204 { 207 {
205 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain file default", "default.r32"); 208 this.TerrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
206 configData.SetAttribute("TerrainFile", this.TerrainFile); 209 configData.SetAttribute("TerrainFile", this.TerrainFile);
207 } 210 }
208 else 211 else
@@ -214,7 +217,7 @@ namespace OpenSim
214 attri = configData.GetAttribute("TerrainMultiplier"); 217 attri = configData.GetAttribute("TerrainMultiplier");
215 if (attri == "") 218 if (attri == "")
216 { 219 {
217 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Terrain multiplier", "60.0"); 220 string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
218 this.TerrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); 221 this.TerrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
219 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString()); 222 configData.SetAttribute("TerrainMultiplier", this.TerrainMultiplier.ToString());
220 } 223 }
@@ -223,21 +226,48 @@ namespace OpenSim
223 this.TerrainMultiplier = Convert.ToDouble(attri); 226 this.TerrainMultiplier = Convert.ToDouble(attri);
224 } 227 }
225 228
229 attri = "";
230 attri = configData.GetAttribute("MasterAvatarFirstName");
231 if (attri == "")
232 {
233 this.MasterAvatarFirstName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: First name of Master Avatar", "Test");
234
235 configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
236 }
237 else
238 {
239 this.MasterAvatarFirstName = attri;
240 }
226 241
227 attri = ""; 242 attri = "";
228 attri = configData.GetAttribute("RegionOwnerName"); 243 attri = configData.GetAttribute("MasterAvatarLastName");
229 if (attri == "") 244 if (attri == "")
230 { 245 {
231 string name = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Region Owner Avatar Name", "Test User"); 246 this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Last name of Master Avatar", "User");
232 this.RegionOwnerName = name; 247
233 configData.SetAttribute("RegionOwnerName", this.RegionOwnerName); 248 configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
234 } 249 }
235 else 250 else
236 { 251 {
237 this.RegionOwnerName = attri; 252 this.MasterAvatarLastName = attri;
238 } 253 }
239 254
240 if (!isSandbox) 255 if (isSandbox) //Sandbox Mode Settings
256 {
257 attri = "";
258 attri = configData.GetAttribute("MasterAvatarSandboxPassword");
259 if (attri == "")
260 {
261 this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("SANDBOX MODE SETTING: Password of Master Avatar", "test");
262
263 configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
264 }
265 else
266 {
267 this.MasterAvatarSandboxPassword = attri;
268 }
269 }
270 else //Grid Mode Settings
241 { 271 {
242 //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 272 //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
243 273
@@ -246,7 +276,7 @@ namespace OpenSim
246 attri = configData.GetAttribute("GridServerURL"); 276 attri = configData.GetAttribute("GridServerURL");
247 if (attri == "") 277 if (attri == "")
248 { 278 {
249 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/"); 279 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: Grid server URL", "http://127.0.0.1:8001/");
250 configData.SetAttribute("GridServerURL", this.GridURL); 280 configData.SetAttribute("GridServerURL", this.GridURL);
251 } 281 }
252 else 282 else
@@ -259,7 +289,7 @@ namespace OpenSim
259 attri = configData.GetAttribute("GridSendKey"); 289 attri = configData.GetAttribute("GridSendKey");
260 if (attri == "") 290 if (attri == "")
261 { 291 {
262 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null"); 292 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: Key to send to grid server", "null");
263 configData.SetAttribute("GridSendKey", this.GridSendKey); 293 configData.SetAttribute("GridSendKey", this.GridSendKey);
264 } 294 }
265 else 295 else
@@ -272,7 +302,7 @@ namespace OpenSim
272 attri = configData.GetAttribute("GridRecvKey"); 302 attri = configData.GetAttribute("GridRecvKey");
273 if (attri == "") 303 if (attri == "")
274 { 304 {
275 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null"); 305 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: Key to expect from grid server", "null");
276 configData.SetAttribute("GridRecvKey", this.GridRecvKey); 306 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
277 } 307 }
278 else 308 else
@@ -284,8 +314,8 @@ namespace OpenSim
284 attri = configData.GetAttribute("AssetServerURL"); 314 attri = configData.GetAttribute("AssetServerURL");
285 if (attri == "") 315 if (attri == "")
286 { 316 {
287 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/"); 317 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GRID MODE SETTING: Asset server URL", "http://127.0.0.1:8003/");
288 configData.SetAttribute("AssetServerURL", this.GridURL); 318 configData.SetAttribute("AssetServerURL", this.AssetURL);
289 } 319 }
290 else 320 else
291 { 321 {
@@ -293,6 +323,7 @@ namespace OpenSim
293 } 323 }
294 324
295 } 325 }
326
296 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); 327 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
297 if (!this.isSandbox) 328 if (!this.isSandbox)
298 { 329 {
@@ -306,8 +337,8 @@ namespace OpenSim
306 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 337 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
307 } 338 }
308 339
309 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:"); 340 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Simulator Settings Loaded");
310 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated()); 341 /* OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());
311 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName); 342 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);
312 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 343 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
313 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString()); 344 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());
@@ -316,7 +347,7 @@ namespace OpenSim
316 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL); 347 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL);
317 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey); 348 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey);
318 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL); 349 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL);
319 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); 350 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); */
320 } 351 }
321 } 352 }
322} 353}
diff --git a/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs b/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs
index 53b14f3..213af46 100644
--- a/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs
+++ b/OpenSim/OpenSim.RegionServer/world/ParcelManager.cs
@@ -351,10 +351,10 @@ namespace OpenSim.RegionServer.world
351 fullSimParcel.parcelData.parcelName = "Your Sim Parcel"; 351 fullSimParcel.parcelData.parcelName = "Your Sim Parcel";
352 fullSimParcel.parcelData.parcelDesc = ""; 352 fullSimParcel.parcelData.parcelDesc = "";
353 353
354 fullSimParcel.parcelData.ownerID = LLUUID.Zero; 354 fullSimParcel.parcelData.ownerID = m_world.m_regInfo.MasterAvatarAssignedUUID;
355 fullSimParcel.parcelData.salePrice = -1; 355 fullSimParcel.parcelData.salePrice = 1;
356 fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.None; 356 fullSimParcel.parcelData.parcelFlags = libsecondlife.Parcel.ParcelFlags.ForSale;
357 fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Abandoned; 357 fullSimParcel.parcelData.parcelStatus = libsecondlife.Parcel.ParcelStatus.Leased;
358 addParcel(fullSimParcel); 358 addParcel(fullSimParcel);
359 359
360 360
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 39ba55e..7624d88 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -184,6 +184,36 @@ namespace OpenSim
184 // Start UDP server 184 // Start UDP server
185 this.m_udpServer.ServerListener(); 185 this.m_udpServer.ServerListener();
186 186
187 //Setup Master Avatar
188 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up Master Avatar");
189 if (this.m_sandbox)
190 {
191 OpenSim.Framework.User.UserProfile masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
192 if(masterUser == null)
193 {
194 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Sandbox Mode; Master Avatar is a new user; creating account.");
195 adminLoginServer.CreateUserAccount(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName, this.regionData.MasterAvatarSandboxPassword);
196 masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
197 if(masterUser == null) //Still NULL?!!?! OMG FAIL!
198 {
199 throw new Exception("Failure to create master user account");
200 }
201 }
202 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Master User UUID: " + masterUser.UUID.ToStringHyphenated());
203 regionData.MasterAvatarAssignedUUID = masterUser.UUID;
204
205 }
206 else
207 {
208 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!");
209 }
210
211 Console.WriteLine("Creating ParcelManager");
212 LocalWorld.parcelManager = new OpenSim.RegionServer.world.ParcelManager(this.LocalWorld);
213
214 Console.WriteLine("Loading Parcels from DB...");
215 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
216
187 m_heartbeatTimer.Enabled = true; 217 m_heartbeatTimer.Enabled = true;
188 m_heartbeatTimer.Interval = 100; 218 m_heartbeatTimer.Interval = 100;
189 m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat); 219 m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
@@ -254,12 +284,6 @@ namespace OpenSim
254 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. 284 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
255 LocalWorld.LoadWorldMap(); 285 LocalWorld.LoadWorldMap();
256 286
257 Console.WriteLine("Creating ParcelManager");
258 LocalWorld.parcelManager = new OpenSim.RegionServer.world.ParcelManager(this.LocalWorld);
259
260 Console.WriteLine("Loading Parcels from DB...");
261 LocalWorld.localStorage.LoadParcels((ILocalStorageParcelReceiver)LocalWorld.parcelManager);
262
263 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system"); 287 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system");
264 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 288 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
265 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); 289 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());