aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-04-02 15:48:01 +0000
committerMW2007-04-02 15:48:01 +0000
commitfdc9ed89b4adaa7f23ca06613b2ee36c30895021 (patch)
tree3c90368815d37055bac61ee3bdce5b5593715e2a
parentAdded OpenSim.GenericConfig.Xml project, so we can swap to a more generic con... (diff)
downloadopensim-SC_OLD-fdc9ed89b4adaa7f23ca06613b2ee36c30895021.zip
opensim-SC_OLD-fdc9ed89b4adaa7f23ca06613b2ee36c30895021.tar.gz
opensim-SC_OLD-fdc9ed89b4adaa7f23ca06613b2ee36c30895021.tar.bz2
opensim-SC_OLD-fdc9ed89b4adaa7f23ca06613b2ee36c30895021.tar.xz
OpenSim no longer uses OpenSim.Config.SimConfigDb4o, it now uses OpenSim.GenericConfig.Xml (or a class implementing IGenericConfig).
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework/IGenericConfig.cs15
-rw-r--r--OpenSim.Framework/UserProfileManagerBase.cs62
-rw-r--r--OpenSim.GenericConfig/Xml/XmlConfig.cs25
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj9
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build2
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs59
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs229
-rw-r--r--OpenSim.RegionServer/world/World.cs4
-rw-r--r--OpenSim.build18
-rw-r--r--OpenSim.sln211
-rw-r--r--prebuild.xml45
11 files changed, 472 insertions, 207 deletions
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/IGenericConfig.cs
new file mode 100644
index 0000000..a853fe4
--- /dev/null
+++ b/OpenSim.Framework/IGenericConfig.cs
@@ -0,0 +1,15 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework.Interfaces
6{
7 public interface IGenericConfig
8 {
9 void LoadData();
10 string GetAttribute(string attributeName);
11 bool SetAttribute(string attributeName, string attributeValue);
12 void Commit();
13 void Close();
14 }
15}
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index c022feb..4428831 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -13,36 +13,40 @@ namespace OpenSim.Framework.User
13 13
14 public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>(); 14 public Dictionary<LLUUID, UserProfile> UserProfiles = new Dictionary<LLUUID, UserProfile>();
15 15
16 public UserProfileManagerBase() { 16 public UserProfileManagerBase()
17 } 17 {
18 }
18 19
19 public virtual void InitUserProfiles() 20 public virtual void InitUserProfiles()
20 { 21 {
21 IObjectContainer db; 22 IObjectContainer db;
22 db = Db4oFactory.OpenFile("userprofiles.yap"); 23 db = Db4oFactory.OpenFile("userprofiles.yap");
23 IObjectSet result = db.Get(typeof(UserProfile)); 24 IObjectSet result = db.Get(typeof(UserProfile));
24 foreach (UserProfile userprof in result) { 25 foreach (UserProfile userprof in result)
25 UserProfiles.Add(userprof.UUID, userprof); 26 {
26 } 27 UserProfiles.Add(userprof.UUID, userprof);
27 Console.WriteLine("UserProfiles.Cs:InitUserProfiles() - Successfully loaded " + result.Count.ToString() + " from database"); 28 }
28 db.Close(); 29 Console.WriteLine("UserProfiles.Cs:InitUserProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
30 db.Close();
29 } 31 }
30 32
31 public virtual void SaveUserProfiles() // ZOMG! INEFFICIENT! 33 public virtual void SaveUserProfiles() // ZOMG! INEFFICIENT!
32 { 34 {
33 IObjectContainer db; 35 IObjectContainer db;
34 db = Db4oFactory.OpenFile("userprofiles.yap"); 36 db = Db4oFactory.OpenFile("userprofiles.yap");
35 IObjectSet result = db.Get(typeof(UserProfile)); 37 IObjectSet result = db.Get(typeof(UserProfile));
36 foreach (UserProfile userprof in result) { 38 foreach (UserProfile userprof in result)
37 db.Delete(userprof); 39 {
38 db.Commit(); 40 db.Delete(userprof);
39 } 41 db.Commit();
40 foreach (UserProfile userprof in UserProfiles.Values) { 42 }
41 db.Set(userprof); 43 foreach (UserProfile userprof in UserProfiles.Values)
42 db.Commit(); 44 {
43 } 45 db.Set(userprof);
44 db.Close(); 46 db.Commit();
45 } 47 }
48 db.Close();
49 }
46 50
47 public UserProfile GetProfileByName(string firstname, string lastname) 51 public UserProfile GetProfileByName(string firstname, string lastname)
48 { 52 {
@@ -74,13 +78,13 @@ namespace OpenSim.Framework.User
74 } 78 }
75 else 79 else
76 { 80 {
77 Console.WriteLine("UserProfile - not authorised, password not match "+ TheUser.MD5passwd +" and "+ passwd); 81 Console.WriteLine("UserProfile - not authorised, password not match " + TheUser.MD5passwd + " and " + passwd);
78 return false; 82 return false;
79 } 83 }
80 } 84 }
81 else 85 else
82 { 86 {
83 Console.WriteLine("UserProfile - not authorised , unkown: "+ firstname +" , " + lastname); 87 Console.WriteLine("UserProfile - not authorised , unkown: " + firstname + " , " + lastname);
84 return false; 88 return false;
85 } 89 }
86 90
@@ -102,8 +106,8 @@ namespace OpenSim.Framework.User
102 newprofile.UUID = LLUUID.Random(); 106 newprofile.UUID = LLUUID.Random();
103 newprofile.Inventory.CreateRootFolder(newprofile.UUID, true); 107 newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
104 this.UserProfiles.Add(newprofile.UUID, newprofile); 108 this.UserProfiles.Add(newprofile.UUID, newprofile);
105 return newprofile; 109 return newprofile;
106 } 110 }
107 111
108 public virtual AgentInventory GetUsersInventory(LLUUID agentID) 112 public virtual AgentInventory GetUsersInventory(LLUUID agentID)
109 { 113 {
diff --git a/OpenSim.GenericConfig/Xml/XmlConfig.cs b/OpenSim.GenericConfig/Xml/XmlConfig.cs
index 39321cc..c398229 100644
--- a/OpenSim.GenericConfig/Xml/XmlConfig.cs
+++ b/OpenSim.GenericConfig/Xml/XmlConfig.cs
@@ -12,6 +12,7 @@ namespace OpenSim.GenericConfig
12 private XmlNode rootNode; 12 private XmlNode rootNode;
13 private XmlNode configNode; 13 private XmlNode configNode;
14 private string fileName; 14 private string fileName;
15 private bool createdFile = false;
15 16
16 public XmlConfig(string filename) 17 public XmlConfig(string filename)
17 { 18 {
@@ -23,10 +24,22 @@ namespace OpenSim.GenericConfig
23 doc = new XmlDocument(); 24 doc = new XmlDocument();
24 try 25 try
25 { 26 {
26 XmlTextReader reader = new XmlTextReader(fileName); 27 if (System.IO.File.Exists(fileName))
27 reader.WhitespaceHandling = WhitespaceHandling.None; 28 {
28 doc.Load(reader); 29 XmlTextReader reader = new XmlTextReader(fileName);
29 reader.Close(); 30 reader.WhitespaceHandling = WhitespaceHandling.None;
31 doc.Load(reader);
32 reader.Close();
33 }
34 else
35 {
36 createdFile = true;
37 rootNode = doc.CreateNode(XmlNodeType.Element, "Root", "");
38 doc.AppendChild(rootNode);
39 configNode = doc.CreateNode(XmlNodeType.Element, "Config", "");
40 rootNode.AppendChild(configNode);
41 }
42
30 } 43 }
31 catch (Exception e) 44 catch (Exception e)
32 { 45 {
@@ -48,6 +61,10 @@ namespace OpenSim.GenericConfig
48 { 61 {
49 Console.WriteLine(e.Message); 62 Console.WriteLine(e.Message);
50 } 63 }
64 if (createdFile)
65 {
66 this.Commit();
67 }
51 } 68 }
52 69
53 public string GetAttribute(string attributeName) 70 public string GetAttribute(string attributeName)
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index e293a8c..b9b440f 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -92,6 +92,12 @@
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
96 <Name>OpenSim.GenericConfig.Xml</Name>
97 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 101 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name> 102 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 103 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
@@ -127,6 +133,9 @@
127 <Compile Include="QueItem.cs"> 133 <Compile Include="QueItem.cs">
128 <SubType>Code</SubType> 134 <SubType>Code</SubType>
129 </Compile> 135 </Compile>
136 <Compile Include="RegionInfo.cs">
137 <SubType>Code</SubType>
138 </Compile>
130 <Compile Include="SimClient.cs"> 139 <Compile Include="SimClient.cs">
131 <SubType>Code</SubType> 140 <SubType>Code</SubType>
132 </Compile> 141 </Compile>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 6f86970..926a310 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -18,6 +18,7 @@
18 <include name="OpenSimNetworkHandler.cs" /> 18 <include name="OpenSimNetworkHandler.cs" />
19 <include name="PacketServer.cs" /> 19 <include name="PacketServer.cs" />
20 <include name="QueItem.cs" /> 20 <include name="QueItem.cs" />
21 <include name="RegionInfo.cs" />
21 <include name="SimClient.cs" /> 22 <include name="SimClient.cs" />
22 <include name="SimConsole.cs" /> 23 <include name="SimConsole.cs" />
23 <include name="VersionInfo.cs" /> 24 <include name="VersionInfo.cs" />
@@ -47,6 +48,7 @@
47 <include name="../bin/Db4objects.Db4o.dll" /> 48 <include name="../bin/Db4objects.Db4o.dll" />
48 <include name="../bin/OpenSim.Framework.dll" /> 49 <include name="../bin/OpenSim.Framework.dll" />
49 <include name="../bin/OpenSim.Framework.Console.dll" /> 50 <include name="../bin/OpenSim.Framework.Console.dll" />
51 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
50 <include name="../bin/OpenSim.Physics.Manager.dll" /> 52 <include name="../bin/OpenSim.Physics.Manager.dll" />
51 <include name="../bin/OpenSim.Servers.dll" /> 53 <include name="../bin/OpenSim.Servers.dll" />
52 </references> 54 </references>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index c0fe95b..8bbdcd5 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -45,6 +45,7 @@ using OpenSim.Assets;
45using OpenSim.CAPS; 45using OpenSim.CAPS;
46using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
47using OpenSim.Physics.Manager; 47using OpenSim.Physics.Manager;
48using OpenSim.GenericConfig;
48using Nwc.XmlRpc; 49using Nwc.XmlRpc;
49using OpenSim.Servers; 50using OpenSim.Servers;
50 51
@@ -53,7 +54,9 @@ namespace OpenSim
53 54
54 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback 55 public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
55 { 56 {
56 private SimConfig Cfg; 57 //private SimConfig Cfg;
58 private IGenericConfig localConfig;
59 //private IGenericConfig remoteConfig;
57 private PhysicsManager physManager; 60 private PhysicsManager physManager;
58 private Grid GridServers; 61 private Grid GridServers;
59 private BaseHttpServer _httpServer; 62 private BaseHttpServer _httpServer;
@@ -64,6 +67,7 @@ namespace OpenSim
64 //private Dictionary<uint, SimClient> ClientThreads = new Dictionary<uint, SimClient>(); 67 //private Dictionary<uint, SimClient> ClientThreads = new Dictionary<uint, SimClient>();
65 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 68 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
66 private DateTime startuptime; 69 private DateTime startuptime;
70 private RegionInfo regionData;
67 71
68 public Socket Server; 72 public Socket Server;
69 private IPEndPoint ServerIncoming; 73 private IPEndPoint ServerIncoming;
@@ -74,7 +78,7 @@ namespace OpenSim
74 private AsyncCallback ReceivedData; 78 private AsyncCallback ReceivedData;
75 79
76 private System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer(); 80 private System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
77 private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; 81 //private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll";
78 public string m_physicsEngine; 82 public string m_physicsEngine;
79 public bool m_sandbox = false; 83 public bool m_sandbox = false;
80 public bool m_loginserver; 84 public bool m_loginserver;
@@ -94,6 +98,30 @@ namespace OpenSim
94 98
95 public virtual void StartUp() 99 public virtual void StartUp()
96 { 100 {
101 this.regionData = new RegionInfo();
102 try
103 {
104 this.localConfig = new XmlConfig("simconfig.xml");
105 this.localConfig.LoadData();
106 }
107 catch (Exception e)
108 {
109 Console.WriteLine(e.Message);
110 }
111
112 string configfromgrid = localConfig.GetAttribute("ConfigFromGrid");
113 if (configfromgrid == "true")
114 {
115 //config from remote server is not implemented yet
116 //this.remoteConfig = new RemoteConfig(localConfig.GetAttribute("RemoteConfigURL"), localConfig.GetAttribute("SimUUID"));
117 //this.remoteConfig.LoadData();
118 //this.regionData.InitConfig(this.m_sandbox, this.remoteConfig);
119 //this.remoteConfig.Close();
120 }
121 else
122 {
123 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
124 }
97 125
98 GridServers = new Grid(); 126 GridServers = new Grid();
99 if (m_sandbox) 127 if (m_sandbox)
@@ -120,17 +148,14 @@ namespace OpenSim
120 148
121 // We check our local database first, then the grid for config options 149 // We check our local database first, then the grid for config options
122 m_console.WriteLine("Main.cs:Startup() - Loading configuration"); 150 m_console.WriteLine("Main.cs:Startup() - Loading configuration");
123 Cfg = this.LoadConfigDll(this.ConfigDll); 151 //Cfg = this.LoadConfigDll(this.ConfigDll);
124 Cfg.InitConfig(this.m_sandbox); 152 //Cfg.InitConfig(this.m_sandbox);
125 m_console.WriteLine("Main.cs:Startup() - Contacting gridserver");
126 Cfg.LoadFromGrid();
127 153
128 PacketServer packetServer = new PacketServer(this); 154 PacketServer packetServer = new PacketServer(this);
129 155
130 m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString()); 156 m_console.WriteLine("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
131 m_console.WriteLine("Initialising world"); 157 m_console.WriteLine("Initialising world");
132 LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg); 158 LocalWorld = new World(this._packetServer.ClientThreads, regionData.RegionHandle, regionData.RegionName);
133 //LocalWorld.LandMap = Cfg.LoadWorld();
134 LocalWorld.InventoryCache = InventoryCache; 159 LocalWorld.InventoryCache = InventoryCache;
135 LocalWorld.AssetCache = AssetCache; 160 LocalWorld.AssetCache = AssetCache;
136 161
@@ -147,10 +172,10 @@ namespace OpenSim
147 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use 172 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use
148 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap); 173 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap);
149 174
150 GridServers.AssetServer.SetServerInfo(Cfg.AssetURL, Cfg.AssetSendKey); 175 //should be passing a IGenericConfig object to these so they can read the config data they want from it
151 //GridServers.GridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey); 176 GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);
152 IGridServer gridServer = GridServers.GridServer; 177 IGridServer gridServer = GridServers.GridServer;
153 gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey); 178 gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);
154 179
155 LocalWorld.LoadPrimsFromStorage(); 180 LocalWorld.LoadPrimsFromStorage();
156 181
@@ -161,7 +186,7 @@ namespace OpenSim
161 186
162 m_console.WriteLine("Main.cs:Startup() - Initialising HTTP server"); 187 m_console.WriteLine("Main.cs:Startup() - Initialising HTTP server");
163 // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort); 188 // HttpServer = new SimCAPSHTTPServer(GridServers.GridServer, Cfg.IPListenPort);
164 _httpServer = new BaseHttpServer(Cfg.IPListenPort); 189 _httpServer = new BaseHttpServer(regionData.IPListenPort);
165 190
166 if (gridServer.GetName() == "Remote") 191 if (gridServer.GetName() == "Remote")
167 { 192 {
@@ -195,7 +220,7 @@ namespace OpenSim
195 bool sandBoxWithLoginServer = m_loginserver && m_sandbox; 220 bool sandBoxWithLoginServer = m_loginserver && m_sandbox;
196 if (sandBoxWithLoginServer) 221 if (sandBoxWithLoginServer)
197 { 222 {
198 loginServer = new LoginServer(gridServer, Cfg.IPListenAddr, Cfg.IPListenPort, this.user_accounts); 223 loginServer = new LoginServer(gridServer, regionData.IPListenAddr, regionData.IPListenPort, this.user_accounts);
199 loginServer.Startup(); 224 loginServer.Startup();
200 225
201 if( user_accounts ) 226 if( user_accounts )
@@ -294,9 +319,9 @@ namespace OpenSim
294 private void MainServerListener() 319 private void MainServerListener()
295 { 320 {
296 m_console.WriteLine("Main.cs:MainServerListener() - New thread started"); 321 m_console.WriteLine("Main.cs:MainServerListener() - New thread started");
297 m_console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + Cfg.IPListenAddr + ":" + Cfg.IPListenPort); 322 m_console.WriteLine("Main.cs:MainServerListener() - Opening UDP socket on " + regionData.IPListenAddr + ":" + regionData.IPListenPort);
298 323
299 ServerIncoming = new IPEndPoint(IPAddress.Any, Cfg.IPListenPort); 324 ServerIncoming = new IPEndPoint(IPAddress.Any, regionData.IPListenPort);
300 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 325 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
301 Server.Bind(ServerIncoming); 326 Server.Bind(ServerIncoming);
302 327
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
new file mode 100644
index 0000000..15cc105
--- /dev/null
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -0,0 +1,229 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Interfaces;
5using OpenSim.Framework.Utilities;
6
7namespace OpenSim
8{
9 public class RegionInfo // could inherit from SimProfileBase
10 {
11 public string RegionName;
12
13 public uint RegionLocX;
14 public uint RegionLocY;
15 public ulong RegionHandle;
16
17 public int IPListenPort;
18 public string IPListenAddr;
19
20 //following should be removed and the GenericConfig object passed around,
21 //so each class (AssetServer, GridServer etc) can access what config data they want
22 public string AssetURL = "";
23 public string AssetSendKey = "";
24
25 public string GridURL = "";
26 public string GridSendKey = "";
27 public string GridRecvKey = "";
28 public string UserURL = "";
29 public string UserSendKey = "";
30 public string UserRecvKey = "";
31 private bool isSandbox;
32
33 public RegionInfo()
34 {
35
36 }
37
38 public void InitConfig(bool sandboxMode, IGenericConfig configData)
39 {
40 this.isSandbox = sandboxMode;
41 try
42 {
43 // Sim name
44 string attri ="";
45 attri = configData.GetAttribute("SimName");
46 if (attri == "")
47 {
48 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name [OpenSim test]: ", "OpenSim test");
49 configData.SetAttribute("SimName", this.RegionName);
50 }
51 else
52 {
53 this.RegionName = attri;
54 }
55 // Sim/Grid location X
56 attri = "";
57 attri = configData.GetAttribute("SimLocationX");
58 if (attri == "")
59 {
60 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X [997]: ", "997");
61 configData.SetAttribute("SimLocationX", location);
62 this.RegionLocX = (uint)Convert.ToInt32(location);
63 }
64 else
65 {
66 this.RegionLocX = (uint)Convert.ToInt32(attri);
67 }
68 // Sim/Grid location Y
69 attri = "";
70 attri = configData.GetAttribute("SimLocationY");
71 if (attri == "")
72 {
73 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y [996]: ", "996");
74 configData.SetAttribute("SimLocationY", location);
75 this.RegionLocY = (uint)Convert.ToInt32(location);
76 }
77 else
78 {
79 this.RegionLocY = (uint)Convert.ToInt32(attri);
80 }
81 //Sim Listen Port
82 attri = "";
83 attri = configData.GetAttribute("SimListenPort");
84 if (attri == "")
85 {
86 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections [9000]: ", "9000");
87 configData.SetAttribute("SimListenPort", port);
88 this.IPListenPort = Convert.ToInt32(port);
89 }
90 else
91 {
92 this.IPListenPort = Convert.ToInt32(attri);
93 }
94 //Sim Listen Address
95 attri = "";
96 attri = configData.GetAttribute("SimListenAddress");
97 if (attri == "")
98 {
99 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections [127.0.0.1]: ", "127.0.0.1");
100 configData.SetAttribute("SimListenAddress", this.IPListenAddr);
101 }
102 else
103 {
104 this.IPListenAddr = attri;
105 }
106
107 if (!isSandbox)
108 {
109 //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
110
111 // Asset Server URL
112 attri = "";
113 attri = configData.GetAttribute("AssetServerURL");
114 if (attri == "")
115 {
116 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL: ");
117 configData.SetAttribute("AssetServerURL", this.AssetURL);
118 }
119 else
120 {
121 this.AssetURL = attri;
122 }
123 //Asset Server key
124 attri = "";
125 attri = configData.GetAttribute("AssetServerKey");
126 if (attri == "")
127 {
128 this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server key: ");
129 configData.SetAttribute("AssetServerKey", this.AssetSendKey);
130 }
131 else
132 {
133 this.AssetSendKey = attri;
134 }
135 //Grid Sever URL
136 attri = "";
137 attri = configData.GetAttribute("GridServerURL");
138 if (attri == "")
139 {
140 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL: ");
141 configData.SetAttribute("GridServerURL", this.GridURL);
142 }
143 else
144 {
145 this.GridURL = attri;
146 }
147 //Grid Send Key
148 attri = "";
149 attri = configData.GetAttribute("GridSendKey");
150 if (attri == "")
151 {
152 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server: ");
153 configData.SetAttribute("GridSendKey", this.GridSendKey);
154 }
155 else
156 {
157 this.GridSendKey = attri;
158 }
159 //Grid Receive Key
160 attri = "";
161 attri = configData.GetAttribute("GridRecvKey");
162 if (attri == "")
163 {
164 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server: ");
165 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
166 }
167 else
168 {
169 this.GridRecvKey = attri;
170 }
171 //User Server URL
172 attri = "";
173 attri = configData.GetAttribute("UserServerURL");
174 if (attri == "")
175 {
176 this.UserURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("User server URL: ");
177 configData.SetAttribute("UserServerURL", this.UserURL);
178 }
179 else
180 {
181 this.UserURL = attri;
182 }
183 //User Send Key
184 attri = "";
185 attri = configData.GetAttribute("UserSendKey");
186 if (attri == "")
187 {
188 this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
189 configData.SetAttribute("UserSendKey", this.UserSendKey);
190 }
191 else
192 {
193 this.UserSendKey = attri;
194 }
195 //User Receive Key
196 attri = "";
197 attri = configData.GetAttribute("UserRecvKey");
198 if (attri == "")
199 {
200 this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
201 configData.SetAttribute("UserRecvKey", this.UserRecvKey);
202 }
203 else
204 {
205 this.UserRecvKey = attri;
206 }
207 }
208 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
209 configData.Commit();
210 }
211 catch (Exception e)
212 {
213 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Config.cs:InitConfig() - Exception occured");
214 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
215 }
216
217 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sim settings loaded:");
218 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Name: " + this.RegionName);
219 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());
221 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
222 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sandbox Mode? " + isSandbox.ToString());
223 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset URL: " + this.AssetURL);
224 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Asset key: " + this.AssetSendKey);
225 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid URL: " + this.GridURL);
226 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Grid key: " + this.GridSendKey);
227 }
228 }
229}
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 4f8e53d..e848cad 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -31,16 +31,14 @@ namespace OpenSim.world
31 private Dictionary<uint, SimClient> m_clientThreads; 31 private Dictionary<uint, SimClient> m_clientThreads;
32 private ulong m_regionHandle; 32 private ulong m_regionHandle;
33 private string m_regionName; 33 private string m_regionName;
34 private SimConfig m_cfg;
35 private InventoryCache _inventoryCache; 34 private InventoryCache _inventoryCache;
36 private AssetCache _assetCache; 35 private AssetCache _assetCache;
37 36
38 public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName, SimConfig cfg) 37 public World(Dictionary<uint, SimClient> clientThreads, ulong regionHandle, string regionName)
39 { 38 {
40 m_clientThreads = clientThreads; 39 m_clientThreads = clientThreads;
41 m_regionHandle = regionHandle; 40 m_regionHandle = regionHandle;
42 m_regionName = regionName; 41 m_regionName = regionName;
43 m_cfg = cfg;
44 42
45 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); 43 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
46 Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); 44 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
diff --git a/OpenSim.build b/OpenSim.build
index 46f657e..069b031 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -46,24 +46,24 @@
46 <echo message="Deleting all builds from all configurations" /> 46 <echo message="Deleting all builds from all configurations" />
47 <delete dir="${bin.dir}" failonerror="false" /> 47 <delete dir="${bin.dir}" failonerror="false" />
48 <delete dir="${obj.dir}" failonerror="false" /> 48 <delete dir="${obj.dir}" failonerror="false" />
49 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
49 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> 50 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
50 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> 51 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
51 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
52 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
53 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> 52 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
53 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
54 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> 54 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
55 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> 55 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
56 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> 56 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
57 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> 57 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
58 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
58 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> 59 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
59 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> 60 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
60 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> 61 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
61 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> 62 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
62 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 63 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
63 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> 64 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
64 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
65 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> 65 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
66 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> 66 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
67 </target> 67 </target>
68 68
69 <target name="build" depends="init" description=""> 69 <target name="build" depends="init" description="">
@@ -81,10 +81,10 @@
81 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> 81 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
82 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> 82 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
83 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> 83 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
84 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
84 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> 85 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
85 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> 86 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
86 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> 87 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
87 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
88 </target> 88 </target>
89 89
90 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> 90 <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
@@ -95,24 +95,24 @@
95 95
96 <target name="doc" depends="build-release"> 96 <target name="doc" depends="build-release">
97 <echo message="Generating all documentation from all builds" /> 97 <echo message="Generating all documentation from all builds" />
98 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
98 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> 99 <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
99 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> 100 <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
100 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
101 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
102 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> 101 <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
102 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
103 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> 103 <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
104 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> 104 <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
105 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> 105 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
106 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> 106 <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
107 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
107 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> 108 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
108 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> 109 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
109 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> 110 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
110 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> 111 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
111 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 112 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
112 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> 113 <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
113 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
114 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> 114 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
115 <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> 115 <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
116 </target> 116 </target>
117 117
118</project> 118</project>
diff --git a/OpenSim.sln b/OpenSim.sln
index 12d292d..01a2df2 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,15 +1,15 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual C# Express 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
4EndProject
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}"
4EndProject 6EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}"
6EndProject 8EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
8EndProject 10EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}" 11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}"
10EndProject 12EndProject
11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GenericConfig.Xml", "OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj", "{E88EF749-0000-0000-0000-000000000000}"
12EndProject
13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" 13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}"
14EndProject 14EndProject
15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{83C87BE6-0000-0000-0000-000000000000}" 15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{83C87BE6-0000-0000-0000-000000000000}"
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysic
18EndProject 18EndProject
19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" 19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
20EndProject 20EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}"
22EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" 23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}"
22EndProject 24EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}"
@@ -30,127 +32,90 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorag
30EndProject 32EndProject
31Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" 33Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
32EndProject 34EndProject
33Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
34EndProject
35Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}" 35Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}"
36EndProject 36EndProject
37Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}" 37Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
38EndProject 38EndProject
39Global 39Global
40 GlobalSection(SolutionConfigurationPlatforms) = preSolution 40 GlobalSection(SolutionConfigurationPlatforms) = preSolution
41 Debug|Any CPU = Debug|Any CPU 41 Debug|Any CPU = Debug|Any CPU
42 Release|Any CPU = Release|Any CPU 42 Release|Any CPU = Release|Any CPU
43 EndGlobalSection 43 EndGlobalSection
44 GlobalSection(ProjectDependencies) = postSolution 44 GlobalSection(ProjectConfigurationPlatforms) = postSolution
45 ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 45 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46 ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 46 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
47 ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 47 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
48 ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 48 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
49 ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 49 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 50 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 51 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 52 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
53 ({83C87BE6-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 53 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 ({83C87BE6-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 54 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) 55 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 56 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
57 ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 57 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) 58 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) 59 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) 60 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
61 ({632E1BFD-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 61 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 ({632E1BFD-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 62 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 ({632E1BFD-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) 63 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 ({632E1BFD-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) 64 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
65 ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 65 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 66 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 67 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 68 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
69 ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) 69 {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) 70 {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) 71 {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) 72 {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
73 ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000}) 73 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74 ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) 74 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
75 ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) 75 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
76 ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) 76 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
77 ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) 77 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78 EndGlobalSection 78 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
79 GlobalSection(ProjectConfigurationPlatforms) = postSolution 79 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
80 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 80 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
81 {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 81 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
82 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 82 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
83 {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 83 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
84 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 84 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
85 {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 85 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 86 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
87 {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 87 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
88 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 88 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
89 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 89 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 90 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
91 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 91 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
92 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 92 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
93 {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 93 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
94 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 94 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
95 {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 95 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
96 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 96 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
97 {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 97 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
98 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 98 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
99 {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 99 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
100 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 100 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
101 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 101 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 102 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
103 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 103 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
104 {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 104 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
105 {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 105 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106 {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 106 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
107 {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 107 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
108 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 108 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
109 {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 109 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
110 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 110 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
111 {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 111 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
112 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 112 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
113 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 113 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 114 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
115 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 115 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
116 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 116 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
117 {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 117 EndGlobalSection
118 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 118 GlobalSection(SolutionProperties) = preSolution
119 {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 119 HideSolutionNode = FALSE
120 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 120 EndGlobalSection
121 {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
122 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
123 {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
124 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125 {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
126 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
127 {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
128 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129 {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
130 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
131 {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
132 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133 {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
134 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
135 {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
136 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
137 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
138 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
139 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
140 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
141 {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
142 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
143 {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
144 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145 {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
146 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
147 {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
148 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
149 {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
150 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
151 {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
152 EndGlobalSection
153 GlobalSection(SolutionProperties) = preSolution
154 HideSolutionNode = FALSE
155 EndGlobalSection
156EndGlobal 121EndGlobal
diff --git a/prebuild.xml b/prebuild.xml
index d13a5d3..793da74 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -369,6 +369,28 @@
369 </Files> 369 </Files>
370 </Project> 370 </Project>
371 371
372 <!-- Xml Config Dll -->
373 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
374 <Configuration name="Debug">
375 <Options>
376 <OutputPath>../../bin/</OutputPath>
377 </Options>
378 </Configuration>
379 <Configuration name="Release">
380 <Options>
381 <OutputPath>../../bin/</OutputPath>
382 </Options>
383 </Configuration>
384
385 <ReferencePath>../../bin/</ReferencePath>
386 <Reference name="System"/>
387 <Reference name="System.Xml"/>
388 <Reference name="OpenSim.Framework"/>
389
390 <Files>
391 <Match pattern="*.cs" recurse="true"/>
392 </Files>
393 </Project>
372 394
373 <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library"> 395 <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library">
374 <Configuration name="Debug"> 396 <Configuration name="Debug">
@@ -390,6 +412,7 @@
390 <Reference name="Db4objects.Db4o.dll"/> 412 <Reference name="Db4objects.Db4o.dll"/>
391 <Reference name="OpenSim.Framework"/> 413 <Reference name="OpenSim.Framework"/>
392 <Reference name="OpenSim.Framework.Console"/> 414 <Reference name="OpenSim.Framework.Console"/>
415 <Reference name="OpenSim.GenericConfig.Xml"/>
393 <Reference name="OpenSim.Physics.Manager"/> 416 <Reference name="OpenSim.Physics.Manager"/>
394 <Reference name="OpenSim.Servers"/> 417 <Reference name="OpenSim.Servers"/>
395 418
@@ -453,28 +476,6 @@
453 </Files> 476 </Files>
454 </Project> 477 </Project>
455 478
456 <!-- Xml Config Dll -->
457 <Project name="OpenSim.GenericConfig.Xml" path="OpenSim.GenericConfig/Xml" type="Library">
458 <Configuration name="Debug">
459 <Options>
460 <OutputPath>../../bin/</OutputPath>
461 </Options>
462 </Configuration>
463 <Configuration name="Release">
464 <Options>
465 <OutputPath>../../bin/</OutputPath>
466 </Options>
467 </Configuration>
468
469 <ReferencePath>../../bin/</ReferencePath>
470 <Reference name="System"/>
471 <Reference name="System.Xml"/>
472 <Reference name="OpenSim.Framework"/>
473
474 <Files>
475 <Match pattern="*.cs" recurse="true"/>
476 </Files>
477 </Project>
478 </Solution> 479 </Solution>
479 480
480 481
generated by cgit v1.1 at 2024-11-08 00:45:42 +0000