From a3ed563023f376139719dc78339b8845344071c4 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 25 Mar 2007 18:05:58 +0000
Subject:
---
.../OpenGridServices.GridServer.exe.build | 98 +--
.../OpenGridServices.ServerConsole.dll.build | 86 +-
.../OpenGridServices.UserServer.exe.build | 96 +--
OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs | 31 +
OpenSim.Config/SimConfigDb4o/DbSimConfig.cs | 176 ++++
OpenSim.Config/SimConfigDb4o/MapStorage.cs | 16 +
.../OpenSim.Config.SimConfigDb4o.csproj | 114 +++
.../OpenSim.Config.SimConfigDb4o.dll.build | 47 ++
...penSim.Framework.Config.SimConfigDb4o.dll.build | 47 ++
.../SimConfigDb4o/AssemblyInfo.cs | 31 -
.../SimConfigDb4o/DbSimConfig.cs | 176 ----
.../SimConfigDb4o/MapStorage.cs | 16 -
.../OpenSim.Config.SimConfigDb4o.csproj | 114 ---
.../OpenSim.Config.SimConfigDb4o.dll.build | 47 --
...penSim.Framework.Config.SimConfigDb4o.dll.build | 47 --
.../OpenSim.Framework.Console.dll.build | 82 +-
OpenSim.Framework/OpenSim.Framework.dll.build | 4 +-
.../Local/OpenSim.GridInterfaces.Local.dll.build | 92 +-
.../Remote/OpenSim.GridInterfaces.Remote.dll.build | 90 +-
.../OpenSim.Physics.BasicPhysicsPlugin.dll.build | 84 +-
.../Manager/OpenSim.Physics.Manager.dll.build | 92 +-
.../OdePlugin/OpenSim.Physics.OdePlugin.dll.build | 86 +-
.../OpenSim.Physics.PhysXPlugin.dll.build | 86 +-
.../OpenSim.RegionServer.dll.build | 8 +-
.../OpenSim.Storage.LocalStorageDb4o.dll.build | 92 +-
OpenSim.build | 218 ++---
OpenSim.sln | 2 +-
OpenSim/OpenSim.exe.build | 94 +--
Prebuild/Prebuild.build | 134 +--
Prebuild/Prebuild.sln | 28 +-
Prebuild/src/Prebuild.exe.build | 160 ++--
prebuild.xml | 934 ++++++++++-----------
32 files changed, 1714 insertions(+), 1714 deletions(-)
create mode 100644 OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs
create mode 100644 OpenSim.Config/SimConfigDb4o/DbSimConfig.cs
create mode 100644 OpenSim.Config/SimConfigDb4o/MapStorage.cs
create mode 100644 OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
create mode 100644 OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
create mode 100644 OpenSim.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
delete mode 100644 OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index e119279..05b46e1 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -1,49 +1,49 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build
index 2e6ec3e..270f925 100644
--- a/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build
+++ b/OpenGridServices.ServerConsole/OpenGridServices.ServerConsole.dll.build
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 710b01b..4130055 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -1,48 +1,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs b/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs
new file mode 100644
index 0000000..96c3e73
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("SimConfig")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SimConfig")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// This sets the default COM visibility of types in the assembly to invisible.
+// If you need to expose a type to COM, use [ComVisible(true)] on that type.
+[assembly: ComVisible(false)]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs b/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs
new file mode 100644
index 0000000..250f3fd
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/DbSimConfig.cs
@@ -0,0 +1,176 @@
+/*
+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+* * Neither the name of the nor the
+* names of its contributors may be used to endorse or promote products
+* derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+*/
+using System;
+using System.Collections.Generic;
+using OpenSim;
+using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Terrain;
+//using OpenSim.world;
+using Db4objects.Db4o;
+
+namespace OpenSim.Config.SimConfigDb4o
+{
+ public class Db40ConfigPlugin: ISimConfig
+ {
+ public SimConfig GetConfigObject()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll");
+ return ( new DbSimConfig());
+ }
+ }
+
+ public class DbSimConfig : SimConfig
+ {
+ private bool isSandbox;
+ private IObjectContainer db;
+
+ public void LoadDefaults() {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
+
+ this.RegionName=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ","OpenSim test");
+ this.RegionLocX=(uint)Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ","997"));
+ this.RegionLocY=(uint)Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ","996"));
+ this.IPListenPort=Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ","9000"));
+ this.IPListenAddr=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ","127.0.0.1");
+
+ if(!isSandbox)
+ {
+ this.AssetURL=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL: ");
+ this.AssetSendKey=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server key: ");
+ this.GridURL=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL: ");
+ this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
+ this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
+ this.UserURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("User server URL: ");
+ this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
+ this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
+ }
+ this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
+ }
+
+ public override void InitConfig(bool sandboxMode) {
+ this.isSandbox = sandboxMode;
+ try {
+ db = Db4oFactory.OpenFile("opensim.yap");
+ IObjectSet result = db.Get(typeof(DbSimConfig));
+ if(result.Count==1) {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a SimConfig object in the local database, loading");
+ foreach (DbSimConfig cfg in result) {
+ this.RegionName = cfg.RegionName;
+ this.RegionLocX = cfg.RegionLocX;
+ this.RegionLocY = cfg.RegionLocY;
+ this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
+ this.IPListenPort = cfg.IPListenPort;
+ this.IPListenAddr = cfg.IPListenAddr;
+ this.AssetURL = cfg.AssetURL;
+ this.AssetSendKey = cfg.AssetSendKey;
+ this.GridURL = cfg.GridURL;
+ this.GridSendKey = cfg.GridSendKey;
+ }
+ } else {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
+ LoadDefaults();
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Writing out default settings to local database");
+ db.Set(this);
+ }
+ } catch(Exception e) {
+ db.Close();
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
+ }
+
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:");
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString());
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sandbox Mode? " + isSandbox.ToString());
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey);
+ }
+
+ public override float[] LoadWorld()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Loading world....");
+ //World blank = new World();
+ float[] heightmap = null;
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Looking for a heightmap in local DB");
+ IObjectSet world_result = db.Get(typeof(MapStorage));
+ if(world_result.Count>0) {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Found a heightmap in local database, loading");
+ MapStorage map=(MapStorage)world_result.Next();
+ //blank.LandMap = map.Map;
+ heightmap = map.Map;
+ } else {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - No heightmap found, generating new one");
+ HeightmapGenHills hills = new HeightmapGenHills();
+ // blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
+ heightmap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Saving heightmap to local database");
+ MapStorage map= new MapStorage();
+ map.Map = heightmap; //blank.LandMap;
+ db.Set(map);
+ db.Commit();
+ }
+ return heightmap;
+ }
+
+ public override void SaveMap(float[] heightmap)
+ {
+ IObjectSet world_result = db.Get(typeof(MapStorage));
+ if(world_result.Count>0) {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - updating saved copy of heightmap in local database");
+ MapStorage map=(MapStorage)world_result.Next();
+ db.Delete(map);
+ }
+ MapStorage map1= new MapStorage();
+ map1.Map = heightmap; //OpenSim_Main.local_world.LandMap;
+ db.Set(map1);
+ db.Commit();
+ }
+
+ public override void LoadFromGrid() {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadFromGrid() - dummy function, DOING ABSOLUTELY NOTHING AT ALL!!!");
+ // TODO: Make this crap work
+ /* WebRequest GridLogin = WebRequest.Create(this.GridURL + "regions/" + this.RegionHandle.ToString() + "/login");
+ WebResponse GridResponse = GridLogin.GetResponse();
+ byte[] idata = new byte[(int)GridResponse.ContentLength];
+ BinaryReader br = new BinaryReader(GridResponse.GetResponseStream());
+
+ br.Close();
+ GridResponse.Close();
+ */
+ }
+
+ public void Shutdown() {
+ db.Close();
+ }
+ }
+
+}
diff --git a/OpenSim.Config/SimConfigDb4o/MapStorage.cs b/OpenSim.Config/SimConfigDb4o/MapStorage.cs
new file mode 100644
index 0000000..eb68a94
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/MapStorage.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace OpenSim.Config.SimConfigDb4o
+{
+ public class MapStorage
+ {
+ public float[] Map;
+
+ public MapStorage()
+ {
+
+ }
+ }
+}
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
new file mode 100644
index 0000000..cf13d5b
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
@@ -0,0 +1,114 @@
+
+
+ Local
+ 8.0.50727
+ 2.0
+ {C77FAE85-A786-4DEB-9AEB-46B75169079C}
+ Debug
+ AnyCPU
+
+
+
+ OpenSim.Config.SimConfigDb4o
+ JScript
+ Grid
+ IE50
+ false
+ Library
+
+ OpenSim.Config.SimConfigDb4o
+
+
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+ False
+ 285212672
+ False
+
+
+ TRACE
+
+ False
+ 4096
+ True
+ ..\..\bin\
+ False
+ False
+ False
+ 4
+
+
+
+
+ System.dll
+ False
+
+
+ ..\..\bin\System.Data.dll
+ False
+
+
+ System.Xml.dll
+ False
+
+
+ ..\..\bin\libsecondlife.dll
+ False
+
+
+ ..\..\bin\Db4objects.Db4o.dll
+ False
+
+
+
+
+ OpenSim.Framework
+ {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ OpenSim.Framework.Console
+ {CE124F22-69FC-4499-AE68-1B877C5898C4}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
new file mode 100644
index 0000000..3dfa7ce
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
new file mode 100644
index 0000000..9e9d767
--- /dev/null
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs b/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
deleted file mode 100644
index 96c3e73..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/AssemblyInfo.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("SimConfig")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SimConfig")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// This sets the default COM visibility of types in the assembly to invisible.
-// If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs b/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
deleted file mode 100644
index 250f3fd..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/DbSimConfig.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in the
-* documentation and/or other materials provided with the distribution.
-* * Neither the name of the nor the
-* names of its contributors may be used to endorse or promote products
-* derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*/
-using System;
-using System.Collections.Generic;
-using OpenSim;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Terrain;
-//using OpenSim.world;
-using Db4objects.Db4o;
-
-namespace OpenSim.Config.SimConfigDb4o
-{
- public class Db40ConfigPlugin: ISimConfig
- {
- public SimConfig GetConfigObject()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Loading Db40Config dll");
- return ( new DbSimConfig());
- }
- }
-
- public class DbSimConfig : SimConfig
- {
- private bool isSandbox;
- private IObjectContainer db;
-
- public void LoadDefaults() {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadDefaults() - Please press enter to retain default or enter new settings");
-
- this.RegionName=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ","OpenSim test");
- this.RegionLocX=(uint)Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ","997"));
- this.RegionLocY=(uint)Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ","996"));
- this.IPListenPort=Convert.ToInt32(OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ","9000"));
- this.IPListenAddr=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ","127.0.0.1");
-
- if(!isSandbox)
- {
- this.AssetURL=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL: ");
- this.AssetSendKey=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server key: ");
- this.GridURL=OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL: ");
- this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
- this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
- this.UserURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("User server URL: ");
- this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
- this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
- }
- this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
- }
-
- public override void InitConfig(bool sandboxMode) {
- this.isSandbox = sandboxMode;
- try {
- db = Db4oFactory.OpenFile("opensim.yap");
- IObjectSet result = db.Get(typeof(DbSimConfig));
- if(result.Count==1) {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Found a SimConfig object in the local database, loading");
- foreach (DbSimConfig cfg in result) {
- this.RegionName = cfg.RegionName;
- this.RegionLocX = cfg.RegionLocX;
- this.RegionLocY = cfg.RegionLocY;
- this.RegionHandle = Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
- this.IPListenPort = cfg.IPListenPort;
- this.IPListenAddr = cfg.IPListenAddr;
- this.AssetURL = cfg.AssetURL;
- this.AssetSendKey = cfg.AssetSendKey;
- this.GridURL = cfg.GridURL;
- this.GridSendKey = cfg.GridSendKey;
- }
- } else {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Could not find object in database, loading precompiled defaults");
- LoadDefaults();
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Writing out default settings to local database");
- db.Set(this);
- }
- } catch(Exception e) {
- db.Close();
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
- }
-
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:");
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Region Handle: " + this.RegionHandle.ToString());
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sandbox Mode? " + isSandbox.ToString());
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey);
- }
-
- public override float[] LoadWorld()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Loading world....");
- //World blank = new World();
- float[] heightmap = null;
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Looking for a heightmap in local DB");
- IObjectSet world_result = db.Get(typeof(MapStorage));
- if(world_result.Count>0) {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Found a heightmap in local database, loading");
- MapStorage map=(MapStorage)world_result.Next();
- //blank.LandMap = map.Map;
- heightmap = map.Map;
- } else {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - No heightmap found, generating new one");
- HeightmapGenHills hills = new HeightmapGenHills();
- // blank.LandMap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
- heightmap = hills.GenerateHeightmap(200, 4.0f, 80.0f, false);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - Saving heightmap to local database");
- MapStorage map= new MapStorage();
- map.Map = heightmap; //blank.LandMap;
- db.Set(map);
- db.Commit();
- }
- return heightmap;
- }
-
- public override void SaveMap(float[] heightmap)
- {
- IObjectSet world_result = db.Get(typeof(MapStorage));
- if(world_result.Count>0) {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadWorld() - updating saved copy of heightmap in local database");
- MapStorage map=(MapStorage)world_result.Next();
- db.Delete(map);
- }
- MapStorage map1= new MapStorage();
- map1.Map = heightmap; //OpenSim_Main.local_world.LandMap;
- db.Set(map1);
- db.Commit();
- }
-
- public override void LoadFromGrid() {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:LoadFromGrid() - dummy function, DOING ABSOLUTELY NOTHING AT ALL!!!");
- // TODO: Make this crap work
- /* WebRequest GridLogin = WebRequest.Create(this.GridURL + "regions/" + this.RegionHandle.ToString() + "/login");
- WebResponse GridResponse = GridLogin.GetResponse();
- byte[] idata = new byte[(int)GridResponse.ContentLength];
- BinaryReader br = new BinaryReader(GridResponse.GetResponseStream());
-
- br.Close();
- GridResponse.Close();
- */
- }
-
- public void Shutdown() {
- db.Close();
- }
- }
-
-}
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs b/OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
deleted file mode 100644
index eb68a94..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/MapStorage.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.Config.SimConfigDb4o
-{
- public class MapStorage
- {
- public float[] Map;
-
- public MapStorage()
- {
-
- }
- }
-}
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
deleted file mode 100644
index cf13d5b..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
- Local
- 8.0.50727
- 2.0
- {C77FAE85-A786-4DEB-9AEB-46B75169079C}
- Debug
- AnyCPU
-
-
-
- OpenSim.Config.SimConfigDb4o
- JScript
- Grid
- IE50
- false
- Library
-
- OpenSim.Config.SimConfigDb4o
-
-
-
-
-
- False
- 285212672
- False
-
-
- TRACE;DEBUG
-
- True
- 4096
- False
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
- False
- 285212672
- False
-
-
- TRACE
-
- False
- 4096
- True
- ..\..\bin\
- False
- False
- False
- 4
-
-
-
-
- System.dll
- False
-
-
- ..\..\bin\System.Data.dll
- False
-
-
- System.Xml.dll
- False
-
-
- ..\..\bin\libsecondlife.dll
- False
-
-
- ..\..\bin\Db4objects.Db4o.dll
- False
-
-
-
-
- OpenSim.Framework
- {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
- OpenSim.Framework.Console
- {CE124F22-69FC-4499-AE68-1B877C5898C4}
- {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- False
-
-
-
-
- Code
-
-
- Code
-
-
- Code
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
deleted file mode 100644
index 703abe6..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build b/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
deleted file mode 100644
index 9e9d767..0000000
--- a/OpenSim.Framework.Config/SimConfigDb4o/OpenSim.Framework.Config.SimConfigDb4o.dll.build
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index 2dfc9b0..9ceaea6 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
@@ -1,41 +1,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index ccb2a60..79bbf05 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -7,12 +7,12 @@
-
+
-
+
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index e3b33cb..ec65ba8 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -1,46 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 01bf0df..2060454 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -1,45 +1,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 4217a06..f146733 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -1,42 +1,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4aaca6a..47e5534 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -1,46 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index e738ab1..c67d820 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 395cc6b..8f9e7dc 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -1,43 +1,43 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index e99dd11..66d55fb 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -7,11 +7,11 @@
-
+
-
+
@@ -23,10 +23,10 @@
-
-
+
+
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index ebcda17..44e8597 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -1,46 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.build b/OpenSim.build
index 43ef657..972331b 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -1,109 +1,109 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.sln b/OpenSim.sln
index 88366cc..f377ee9 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -4,7 +4,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{CE124F22-69FC-4499-AE68-1B877C5898C4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Framework.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C77FAE85-A786-4DEB-9AEB-46B75169079C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C77FAE85-A786-4DEB-9AEB-46B75169079C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{0A4D5E28-88B6-474E-AC5F-3F99822DD976}"
EndProject
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index fc516df..7d69d90 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,47 +1,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
index 188a8a7..395fb31 100644
--- a/Prebuild/Prebuild.build
+++ b/Prebuild/Prebuild.build
@@ -1,67 +1,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 95a3f0f..c75302e 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{F7B3D806-20FD-4181-86F1-96E24A9EC850}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}"
@@ -9,17 +9,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProjectSection
EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 628e7e1..43f5516 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -1,80 +1,80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/prebuild.xml b/prebuild.xml
index d61c363..d478c91 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,467 +1,467 @@
-
-
-
-
-
- TRACE;DEBUG
- false
- false
- false
- 4
- false
-
- bin
- true
- true
- false
-
-
-
-
- TRACE
- true
- false
- false
- 4
- false
-
- bin
- false
- true
- false
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/Physics/
-
-
-
-
- ../../bin/Physics/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/Physics/
-
-
-
-
- ../../bin/Physics/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/Physics/
-
-
-
-
- ../../bin/Physics/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../bin/
-
-
-
-
- ../bin/
-
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ../../bin/
-
-
-
-
- ../../bin/
-
-
-
- ../../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUG;TRACE
- false
- bin/Debug
- true
- 1595
-
-
-
-
- TRACE
- bin/Release
- true
- false
- 1595
-
-
-
- prebuild.xml
- prebuild
-
-
-
-
- DEBUG;TRACE
- false
- ..\..\bin\
- true
- Prebuild.snk
- 1595
-
-
-
-
- TRACE
- ..\..\bin\
- true
- false
- Prebuild.snk
- 1595
-
-
- ../bin/
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ TRACE;DEBUG
+ false
+ false
+ false
+ 4
+ false
+
+ bin
+ true
+ true
+ false
+
+
+
+
+ TRACE
+ true
+ false
+ false
+ 4
+ false
+
+ bin
+ false
+ true
+ false
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/
+
+
+
+
+ ../../bin/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/
+
+
+
+
+ ../../bin/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/
+
+
+
+
+ ../../bin/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/
+
+
+
+
+ ../../bin/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/Physics/
+
+
+
+
+ ../../bin/Physics/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/Physics/
+
+
+
+
+ ../../bin/Physics/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/Physics/
+
+
+
+
+ ../../bin/Physics/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../bin/
+
+
+
+
+ ../bin/
+
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ../../bin/
+
+
+
+
+ ../../bin/
+
+
+
+ ../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUG;TRACE
+ false
+ bin/Debug
+ true
+ 1595
+
+
+
+
+ TRACE
+ bin/Release
+ true
+ false
+ 1595
+
+
+
+ prebuild.xml
+ prebuild
+
+
+
+
+ DEBUG;TRACE
+ false
+ ..\..\bin\
+ true
+ Prebuild.snk
+ 1595
+
+
+
+
+ TRACE
+ ..\..\bin\
+ true
+ false
+ Prebuild.snk
+ 1595
+
+
+ ../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1