From 6acfd0ddea3857a10f74095fb7ac73f5c52f1a58 Mon Sep 17 00:00:00 2001
From: MW
Date: Fri, 8 Jun 2007 16:16:32 +0000
Subject: prebuild.xml should be fixed/updated.

---
 .../OpenSim.RegionServer.csproj                    |  12 +-
 OpenSim/OpenSim.RegionServer/RegionInfo.cs         | 147 ---------------------
 2 files changed, 9 insertions(+), 150 deletions(-)
 delete mode 100644 OpenSim/OpenSim.RegionServer/RegionInfo.cs

(limited to 'OpenSim/OpenSim.RegionServer')

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2c61026..b7cea3a 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -69,7 +69,6 @@
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
@@ -162,7 +161,12 @@
     <Compile Include="CommsManager.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimNetworkHandler.cs" />
+    <Compile Include="NetworkServersInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OpenSimNetworkHandler.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -172,7 +176,9 @@
     <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UserConfigUtility.cs" />
+    <Compile Include="UserConfigUtility.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
deleted file mode 100644
index d148d0f..0000000
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
-using System.Web;
-using System.IO;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
-using libsecondlife;
-using OpenSim.Framework.Types;
-
-namespace OpenSim
-{
-    public class RegionInfo : RegionInfoBase
-    {
-        
-        private bool isSandbox;
-
-        public string DataStore;
-
-        public RegionInfo()
-        {
-
-        }
-
-        public void InitConfig(bool sandboxMode, IGenericConfig configData)
-        {
-            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 name
-                attri = "";
-                attri = configData.GetAttribute("SimName");
-                if (attri == "")
-                {
-                    this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test");
-                    configData.SetAttribute("SimName", this.RegionName);
-                }
-                else
-                {
-                    this.RegionName = attri;
-                }
-                // Sim/Grid location X
-                attri = "";
-                attri = configData.GetAttribute("SimLocationX");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997");
-                    configData.SetAttribute("SimLocationX", location);
-                    this.RegionLocX = (uint)Convert.ToUInt32(location);
-                }
-                else
-                {
-                    this.RegionLocX = (uint)Convert.ToUInt32(attri);
-                }
-                // Sim/Grid location Y
-                attri = "";
-                attri = configData.GetAttribute("SimLocationY");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996");
-                    configData.SetAttribute("SimLocationY", location);
-                    this.RegionLocY = (uint)Convert.ToUInt32(location);
-                }
-                else
-                {
-                    this.RegionLocY = (uint)Convert.ToUInt32(attri);
-                }
-
-                // Local storage datastore
-                attri = "";
-                attri = configData.GetAttribute("Datastore");
-                if (attri == "")
-                {
-                    string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
-                    configData.SetAttribute("Datastore", datastore);
-                    this.DataStore = datastore;
-                }
-                else
-                {
-                    this.DataStore = attri;
-                }
-
-                //Sim Listen Port
-                attri = "";
-                attri = configData.GetAttribute("SimListenPort");
-                if (attri == "")
-                {
-                    string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000");
-                    configData.SetAttribute("SimListenPort", port);
-                    this.IPListenPort = Convert.ToInt32(port);
-                }
-                else
-                {
-                    this.IPListenPort = Convert.ToInt32(attri);
-                }
-                //Sim Listen Address
-                attri = "";
-                attri = configData.GetAttribute("SimListenAddress");
-                if (attri == "")
-                {
-                    this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
-                    configData.SetAttribute("SimListenAddress", this.IPListenAddr);
-                }
-                else
-                {
-                    this.IPListenAddr = attri;
-                }
-
-               
-                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
-               
-                configData.Commit();
-            }
-            catch (Exception e)
-            {
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
-                OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
-            }
-
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:");
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString());
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL);
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey);
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL);
-            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey);
-        }
-    }
-}
-- 
cgit v1.1