OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Introduced BaseHttpServer (doing nothing at the moment) 

* Removed OpenSimRoot dependencies from SimClient and AgentAssetUpload. 2 down, 7 left to go.
tourmaline
lbsa71 2007-03-27 18:27:11 +00:00
parent f405d0fada
commit 893a1824d0
27 changed files with 255 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenGridServices.GridServer/OpenGridServices.GridServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}</ProjectGuid> <ProjectGuid>{95FF78AE-0745-4053-8FEF-AFC583C832D2}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>

2
OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}</ProjectGuid> <ProjectGuid>{088BEE36-0600-4B7E-A273-DA184F50FBF0}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>

6
OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{5A62A666-A8D9-4604-ABBD-1B7753B91472}</ProjectGuid> <ProjectGuid>{BF988EF6-D598-4B1B-914E-269BCF7CDF5E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -82,13 +82,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

2
OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</ProjectGuid> <ProjectGuid>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>

2
OpenSim.Framework/OpenSim.Framework.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</ProjectGuid> <ProjectGuid>{1817C154-9111-4C45-A19A-609A5717C1FA}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>

6
OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7EE18181-5891-405A-9590-E2D4EE5A2772}</ProjectGuid> <ProjectGuid>{7F7E640E-6574-4C72-B4BF-0B638669B2D1}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -78,13 +78,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

6
OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{283379F3-2B5E-497E-83C6-AFD53A27FD56}</ProjectGuid> <ProjectGuid>{FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -74,13 +74,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

4
OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BE38C520-803E-40AD-9370-E6D143B9A5F8}</ProjectGuid> <ProjectGuid>{D1C3CCC2-FE8C-4D78-966D-94A9493B174C}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -70,7 +70,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</Project> <Project>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

4
OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</ProjectGuid> <ProjectGuid>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -74,7 +74,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

4
OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}</ProjectGuid> <ProjectGuid>{CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -74,7 +74,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</Project> <Project>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

4
OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{C9BF395E-17FF-4AD6-821D-91907F33F5B7}</ProjectGuid> <ProjectGuid>{1B7578FB-958F-4889-B147-8221CDFC6C4E}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -74,7 +74,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</Project> <Project>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

17
OpenSim.RegionServer/AgentAssetUpload.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Assets;
using OpenSim.Framework.Assets; using OpenSim.Framework.Assets;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using libsecondlife; using libsecondlife;
@ -12,10 +13,14 @@ namespace OpenSim
{ {
private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>(); private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
private SimClient ourClient; private SimClient ourClient;
private AssetCache m_assetCache;
private InventoryCache m_inventoryCache;
public AgentAssetUpload(SimClient client) public AgentAssetUpload(SimClient client, AssetCache assetCache, InventoryCache inventoryCache)
{ {
this.ourClient = client; this.ourClient = client;
m_assetCache = assetCache;
m_inventoryCache = inventoryCache;
} }
public void AddUpload(LLUUID transactionID, AssetBase asset) public void AddUpload(LLUUID transactionID, AssetBase asset)
@ -148,8 +153,8 @@ namespace OpenSim
//check if we should add it to inventory //check if we should add it to inventory
if (trans.AddToInventory) if (trans.AddToInventory)
{ {
OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); m_assetCache.AddAsset(trans.Asset);
OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset); m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
} }
@ -176,7 +181,7 @@ namespace OpenSim
AssetTransaction trans = this.transactions[transactionID]; AssetTransaction trans = this.transactions[transactionID];
if (trans.UploadComplete) if (trans.UploadComplete)
{ {
OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); m_assetCache.AddAsset(trans.Asset);
asset = trans.Asset; asset = trans.Asset;
} }
} }
@ -195,8 +200,8 @@ namespace OpenSim
if (trans.UploadComplete) if (trans.UploadComplete)
{ {
//already complete so we can add it to the inventory //already complete so we can add it to the inventory
OpenSimRoot.Instance.AssetCache.AddAsset(trans.Asset); m_assetCache.AddAsset(trans.Asset);
Console.WriteLine( "ITem created is " +OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated()); Console.WriteLine( "ITem created is " +m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset).ToStringHyphenated());
} }
else else
{ {

41
OpenSim.RegionServer/CAPS/SimHttp.cs
View File

@ -39,22 +39,27 @@ using System.Collections.Generic;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Console; using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Servers;
namespace OpenSim.CAPS namespace OpenSim.CAPS
{ {
// Dummy HTTP server, does nothing useful for now // Dummy HTTP server, does nothing useful for now
public class SimCAPSHTTPServer public class SimCAPSHTTPServer : BaseHttpServer
{ {
public Thread HTTPD; private Thread m_workerThread;
public HttpListener Listener; private HttpListener m_httpListener;
private Dictionary<string, IRestHandler> restHandlers = new Dictionary<string, IRestHandler>(); private Dictionary<string, IRestHandler> m_restHandlers = new Dictionary<string, IRestHandler>();
private IGridServer m_gridServer;
private int m_port;
public SimCAPSHTTPServer() public SimCAPSHTTPServer(IGridServer gridServer, int port)
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting up HTTP Server");
HTTPD = new Thread(new ThreadStart(StartHTTP)); m_workerThread = new Thread(new ThreadStart(StartHTTP));
HTTPD.Start(); m_workerThread.Start();
m_gridServer = gridServer;
m_port = port;
} }
public void StartHTTP() public void StartHTTP()
@ -62,15 +67,15 @@ namespace OpenSim.CAPS
try try
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK");
Listener = new HttpListener(); m_httpListener = new HttpListener();
Listener.Prefixes.Add("http://+:" + OpenSimRoot.Instance.Cfg.IPListenPort + "/"); m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
Listener.Start(); m_httpListener.Start();
HttpListenerContext context; HttpListenerContext context;
while (true) while (true)
{ {
context = Listener.GetContext(); context = m_httpListener.GetContext();
ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context); ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
} }
} }
@ -82,9 +87,9 @@ namespace OpenSim.CAPS
public bool AddRestHandler(string path, IRestHandler handler) public bool AddRestHandler(string path, IRestHandler handler)
{ {
if (!this.restHandlers.ContainsKey(path)) if (!this.m_restHandlers.ContainsKey(path))
{ {
this.restHandlers.Add(path, handler); this.m_restHandlers.Add(path, handler);
return true; return true;
} }
@ -108,12 +113,12 @@ namespace OpenSim.CAPS
agent_data.lastname = (string)requestData["lastname"]; agent_data.lastname = (string)requestData["lastname"];
agent_data.AgentID = new LLUUID((string)requestData["agent_id"]); agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
if (OpenSimRoot.Instance.GridServers.GridServer.GetName() == "Remote") if (m_gridServer.GetName() == "Remote")
{ {
((RemoteGridBase)OpenSimRoot.Instance.GridServers.GridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
((RemoteGridBase)m_gridServer).agentcircuits.Add((uint)agent_data.circuitcode, agent_data);
} }
return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>"; return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>";
break;
} }
} }
catch (Exception e) catch (Exception e)
@ -135,9 +140,9 @@ namespace OpenSim.CAPS
//path[0] should be empty so we are interested in path[1] //path[0] should be empty so we are interested in path[1]
if (path.Length > 1) if (path.Length > 1)
{ {
if ((path[1] != "") && (this.restHandlers.ContainsKey(path[1]))) if ((path[1] != "") && (this.m_restHandlers.ContainsKey(path[1])))
{ {
responseString = this.restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod); responseString = this.m_restHandlers[path[1]].HandleREST(requestBody, requestURL, requestMethod);
} }
} }

18
OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}</ProjectGuid> <ProjectGuid>{D385B640-E037-419A-AC83-5CB6E66D9FF3}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -80,21 +80,27 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name>
<Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</Project> <Project>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Servers</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

3
OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@ -49,9 +49,10 @@
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Axiom.MathLib.dll" /> <include name="../bin/Axiom.MathLib.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
<include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
<include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
<include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" /> <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
<include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> <include name="../Servers/${build.dir}/OpenSim.Servers.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />

4
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim
} }
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(); OpenSimRoot.Instance.HttpServer = new SimCAPSHTTPServer(OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Cfg.IPListenPort);
OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin")); OpenSimRoot.Instance.HttpServer.AddRestHandler("Admin", new AdminWebFront("Admin"));
timer1.Enabled = true; timer1.Enabled = true;
@ -172,7 +172,7 @@ namespace OpenSim
{ // new client { // new client
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
SimClient newuser = new SimClient(epSender, useCircuit); SimClient newuser = new SimClient(epSender, useCircuit, OpenSimRoot.Instance.LocalWorld, OpenSimRoot.Instance.ClientThreads, OpenSimRoot.Instance.AssetCache, OpenSimRoot.Instance.GridServers.GridServer, OpenSimRoot.Instance.Application, OpenSimRoot.Instance.InventoryCache, OpenSimRoot.Instance.Sandbox);
//OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser); //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);
OpenSimRoot.Instance.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser); OpenSimRoot.Instance.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
} }

99
OpenSim.RegionServer/SimClient.cs
View File

@ -71,6 +71,13 @@ namespace OpenSim
private AgentAssetUpload UploadAssets; private AgentAssetUpload UploadAssets;
private LLUUID newAssetFolder = LLUUID.Zero; private LLUUID newAssetFolder = LLUUID.Zero;
private bool debug = false; private bool debug = false;
private World m_world;
private Dictionary<uint, SimClient> m_clientThreads;
private AssetCache m_assetCache;
private IGridServer m_gridServer;
private OpenSimApplication m_application;
private InventoryCache m_inventoryCache;
private bool m_sandboxMode;
private void ack_pack(Packet Pack) private void ack_pack(Packet Pack)
{ {
@ -105,15 +112,15 @@ namespace OpenSim
switch (Pack.Type) switch (Pack.Type)
{ {
case PacketType.CompleteAgentMovement: case PacketType.CompleteAgentMovement:
ClientAvatar.CompleteMovement(OpenSimRoot.Instance.LocalWorld); ClientAvatar.CompleteMovement(m_world);
ClientAvatar.SendInitialPosition(); ClientAvatar.SendInitialPosition();
break; break;
case PacketType.RegionHandshakeReply: case PacketType.RegionHandshakeReply:
OpenSimRoot.Instance.LocalWorld.SendLayerData(this); m_world.SendLayerData(this);
break; break;
case PacketType.AgentWearablesRequest: case PacketType.AgentWearablesRequest:
ClientAvatar.SendInitialAppearance(); ClientAvatar.SendInitialAppearance();
foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
if (client.AgentID != this.AgentID) if (client.AgentID != this.AgentID)
{ {
@ -122,7 +129,7 @@ namespace OpenSim
client.ClientAvatar.SendAppearanceToOtherAgent(this); client.ClientAvatar.SendAppearanceToOtherAgent(this);
} }
} }
OpenSimRoot.Instance.LocalWorld.GetInitialPrims(this); m_world.GetInitialPrims(this);
break; break;
case PacketType.AgentIsNowWearing: case PacketType.AgentIsNowWearing:
AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack; AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
@ -134,7 +141,7 @@ namespace OpenSim
this.ClientAvatar.SetAppearance(appear); this.ClientAvatar.SetAppearance(appear);
break; break;
case PacketType.ObjectAdd: case PacketType.ObjectAdd:
OpenSimRoot.Instance.LocalWorld.AddNewPrim((ObjectAddPacket)Pack, this); m_world.AddNewPrim((ObjectAddPacket)Pack, this);
break; break;
case PacketType.ObjectLink: case PacketType.ObjectLink:
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString()); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(Pack.ToString());
@ -146,7 +153,7 @@ namespace OpenSim
ObjectShapePacket shape = (ObjectShapePacket)Pack; ObjectShapePacket shape = (ObjectShapePacket)Pack;
for (int i = 0; i < shape.ObjectData.Length; i++) for (int i = 0; i < shape.ObjectData.Length; i++)
{ {
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == shape.ObjectData[i].ObjectLocalID) if (ent.localid == shape.ObjectData[i].ObjectLocalID)
{ {
@ -163,7 +170,7 @@ namespace OpenSim
if (multipleupdate.ObjectData[i].Type == 9) //change position if (multipleupdate.ObjectData[i].Type == 9) //change position
{ {
libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0); libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
{ {
@ -177,7 +184,7 @@ namespace OpenSim
else if (multipleupdate.ObjectData[i].Type == 10)//rotation else if (multipleupdate.ObjectData[i].Type == 10)//rotation
{ {
libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true); libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
{ {
@ -190,7 +197,7 @@ namespace OpenSim
{ {
libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12); libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID) if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
{ {
@ -204,13 +211,13 @@ namespace OpenSim
RequestImagePacket imageRequest = (RequestImagePacket)Pack; RequestImagePacket imageRequest = (RequestImagePacket)Pack;
for (int i = 0; i < imageRequest.RequestImage.Length; i++) for (int i = 0; i < imageRequest.RequestImage.Length; i++)
{ {
OpenSimRoot.Instance.AssetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image); m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
} }
break; break;
case PacketType.TransferRequest: case PacketType.TransferRequest:
//Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request"); //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
TransferRequestPacket transfer = (TransferRequestPacket)Pack; TransferRequestPacket transfer = (TransferRequestPacket)Pack;
OpenSimRoot.Instance.AssetCache.AddAssetRequest(this, transfer); m_assetCache.AddAssetRequest(this, transfer);
break; break;
case PacketType.AgentUpdate: case PacketType.AgentUpdate:
ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack); ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack);
@ -230,18 +237,18 @@ namespace OpenSim
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
kill.ObjectData[0].ID = this.ClientAvatar.localid; kill.ObjectData[0].ID = this.ClientAvatar.localid;
foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
client.OutPacket(kill); client.OutPacket(kill);
} }
OpenSimRoot.Instance.GridServers.GridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode); m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
lock (OpenSimRoot.Instance.LocalWorld.Entities) lock (m_world.Entities)
{ {
OpenSimRoot.Instance.LocalWorld.Entities.Remove(this.AgentID); m_world.Entities.Remove(this.AgentID);
} }
//need to do other cleaning up here too //need to do other cleaning up here too
OpenSimRoot.Instance.ClientThreads.Remove(this.CircuitCode); //this.userEP); m_clientThreads.Remove(this.CircuitCode); //this.userEP);
OpenSimRoot.Instance.Application.RemoveClientCircuit(this.CircuitCode); m_application.RemoveClientCircuit(this.CircuitCode);
this.ClientThread.Abort(); this.ClientThread.Abort();
break; break;
case PacketType.ChatFromViewer: case PacketType.ChatFromViewer:
@ -258,7 +265,7 @@ namespace OpenSim
reply.ChatData.FromName = _enc.GetBytes(this.ClientAvatar.firstname + " " + this.ClientAvatar.lastname + "\0"); reply.ChatData.FromName = _enc.GetBytes(this.ClientAvatar.firstname + " " + this.ClientAvatar.lastname + "\0");
reply.ChatData.OwnerID = this.AgentID; reply.ChatData.OwnerID = this.AgentID;
reply.ChatData.SourceID = this.AgentID; reply.ChatData.SourceID = this.AgentID;
foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
client.OutPacket(reply); client.OutPacket(reply);
} }
@ -267,7 +274,7 @@ namespace OpenSim
ObjectImagePacket imagePack = (ObjectImagePacket)Pack; ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
for (int i = 0; i < imagePack.ObjectData.Length; i++) for (int i = 0; i < imagePack.ObjectData.Length; i++)
{ {
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == imagePack.ObjectData[i].ObjectLocalID) if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)
{ {
@ -278,7 +285,7 @@ namespace OpenSim
break; break;
case PacketType.ObjectFlagUpdate: case PacketType.ObjectFlagUpdate:
ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack; ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
foreach (Entity ent in OpenSimRoot.Instance.LocalWorld.Entities.Values) foreach (Entity ent in m_world.Entities.Values)
{ {
if (ent.localid == flags.AgentData.ObjectLocalID) if (ent.localid == flags.AgentData.ObjectLocalID)
{ {
@ -306,7 +313,7 @@ namespace OpenSim
break; break;
case PacketType.CreateInventoryFolder: case PacketType.CreateInventoryFolder:
CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack; CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type); m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type);
Console.WriteLine(Pack.ToString()); Console.WriteLine(Pack.ToString());
break; break;
case PacketType.CreateInventoryItem: case PacketType.CreateInventoryItem:
@ -320,11 +327,11 @@ namespace OpenSim
case PacketType.FetchInventory: case PacketType.FetchInventory:
//Console.WriteLine("fetch item packet"); //Console.WriteLine("fetch item packet");
FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack; FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
OpenSimRoot.Instance.InventoryCache.FetchInventory(this, FetchInventory); m_inventoryCache.FetchInventory(this, FetchInventory);
break; break;
case PacketType.FetchInventoryDescendents: case PacketType.FetchInventoryDescendents:
FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack; FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
OpenSimRoot.Instance.InventoryCache.FetchInventoryDescendents(this, Fetch); m_inventoryCache.FetchInventoryDescendents(this, Fetch);
break; break;
case PacketType.UpdateInventoryItem: case PacketType.UpdateInventoryItem:
UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack; UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
@ -332,17 +339,17 @@ namespace OpenSim
{ {
if (update.InventoryData[i].TransactionID != LLUUID.Zero) if (update.InventoryData[i].TransactionID != LLUUID.Zero)
{ {
AssetBase asset = OpenSimRoot.Instance.AssetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID)); AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
if (asset != null) if (asset != null)
{ {
OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset);
} }
else else
{ {
asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID); asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
if (asset != null) if (asset != null)
{ {
OpenSimRoot.Instance.InventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset); m_inventoryCache.UpdateInventoryItem(this, update.InventoryData[i].ItemID, asset);
} }
} }
} }
@ -350,7 +357,7 @@ namespace OpenSim
break; break;
case PacketType.ViewerEffect: case PacketType.ViewerEffect:
ViewerEffectPacket viewer = (ViewerEffectPacket)Pack; ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
foreach (SimClient client in OpenSimRoot.Instance.ClientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
if (client.AgentID != this.AgentID) if (client.AgentID != this.AgentID)
{ {
@ -362,7 +369,7 @@ namespace OpenSim
break; break;
case PacketType.DeRezObject: case PacketType.DeRezObject:
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet"); //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet");
OpenSimRoot.Instance.LocalWorld.DeRezObject((DeRezObjectPacket)Pack, this); m_world.DeRezObject((DeRezObjectPacket)Pack, this);
break; break;
} }
} }
@ -501,11 +508,11 @@ namespace OpenSim
if (Pack.Header.Zerocoded) if (Pack.Header.Zerocoded)
{ {
int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer); int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
OpenSimRoot.Instance.Application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP); m_application.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
} }
else else
{ {
OpenSimRoot.Instance.Application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP); m_application.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
} }
} }
catch (Exception) catch (Exception)
@ -569,14 +576,22 @@ namespace OpenSim
this.PacketQueue.Enqueue(item); this.PacketQueue.Enqueue(item);
} }
public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack) public SimClient(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, SimClient> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimApplication application, InventoryCache inventoryCache, bool sandboxMode)
{ {
m_world = world;
m_clientThreads = clientThreads;
m_assetCache = assetCache;
m_gridServer = gridServer;
m_application = application;
m_inventoryCache = inventoryCache;
m_sandboxMode = sandboxMode;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack; cirpack = initialcirpack;
userEP = remoteEP; userEP = remoteEP;
PacketQueue = new BlockingQueue<QueItem>(); PacketQueue = new BlockingQueue<QueItem>();
this.UploadAssets = new AgentAssetUpload(this); this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache );
AckTimer = new System.Timers.Timer(500); AckTimer = new System.Timers.Timer(500);
AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed); AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
AckTimer.Start(); AckTimer.Start();
@ -608,14 +623,16 @@ namespace OpenSim
protected virtual void InitNewClient() protected virtual void InitNewClient()
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
OpenSimRoot.Instance.LocalWorld.AddViewerAgent(this);
world.Entity tempent = OpenSimRoot.Instance.LocalWorld.Entities[this.AgentID]; m_world.AddViewerAgent(this);
world.Entity tempent = m_world.Entities[this.AgentID];
this.ClientAvatar = (world.Avatar)tempent; this.ClientAvatar = (world.Avatar)tempent;
} }
protected virtual void AuthUser() protected virtual void AuthUser()
{ {
AuthenticateResponse sessionInfo = OpenSimRoot.Instance.GridServers.GridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
if (!sessionInfo.Authorised) if (!sessionInfo.Authorised)
{ {
//session/circuit not authorised //session/circuit not authorised
@ -638,23 +655,23 @@ namespace OpenSim
} }
// Create Inventory, currently only works for sandbox mode // Create Inventory, currently only works for sandbox mode
if (OpenSimRoot.Instance.Sandbox) if (m_sandboxMode)
{ {
if (sessionInfo.LoginInfo.InventoryFolder != null) if (sessionInfo.LoginInfo.InventoryFolder != null)
{ {
this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder); this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder);
if (sessionInfo.LoginInfo.BaseFolder != null) if (sessionInfo.LoginInfo.BaseFolder != null)
{ {
OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder); m_inventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder);
this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder; this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder;
AssetBase[] inventorySet = OpenSimRoot.Instance.AssetCache.CreateNewInventorySet(this.AgentID); AssetBase[] inventorySet = m_assetCache.CreateNewInventorySet(this.AgentID);
if (inventorySet != null) if (inventorySet != null)
{ {
for (int i = 0; i < inventorySet.Length; i++) for (int i = 0; i < inventorySet.Length; i++)
{ {
if (inventorySet[i] != null) if (inventorySet[i] != null)
{ {
OpenSimRoot.Instance.InventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]); m_inventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]);
} }
} }
} }
@ -670,8 +687,8 @@ namespace OpenSim
{ {
AgentInventory inventory = new AgentInventory(); AgentInventory inventory = new AgentInventory();
inventory.AgentID = this.AgentID; inventory.AgentID = this.AgentID;
OpenSimRoot.Instance.InventoryCache.AddNewAgentsInventory(inventory); m_inventoryCache.AddNewAgentsInventory(inventory);
OpenSimRoot.Instance.InventoryCache.CreateNewInventoryFolder(this, baseFolder); m_inventoryCache.CreateNewInventoryFolder(this, baseFolder);
} }
} }
} }

6
OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{094D67CC-5605-4F32-891F-F026CF6068D0}</ProjectGuid> <ProjectGuid>{CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -78,13 +78,13 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

150
OpenSim.sln
View File

@ -1,34 +1,34 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{5A62A666-A8D9-4604-ABBD-1B7753B91472}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{BF988EF6-D598-4B1B-914E-269BCF7CDF5E}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{088BEE36-0600-4B7E-A273-DA184F50FBF0}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{283379F3-2B5E-497E-83C6-AFD53A27FD56}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{094D67CC-5605-4F32-891F-F026CF6068D0}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{1817C154-9111-4C45-A19A-609A5717C1FA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{95FF78AE-0745-4053-8FEF-AFC583C832D2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{BE38C520-803E-40AD-9370-E6D143B9A5F8}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{D1C3CCC2-FE8C-4D78-966D-94A9493B174C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{FD466C1A-5A7A-4764-83DB-439CD977917D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{631F3710-2C88-4AD4-AA6E-FB06BC909769}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{D385B640-E037-419A-AC83-5CB6E66D9FF3}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{7EE18181-5891-405A-9590-E2D4EE5A2772}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{7F7E640E-6574-4C72-B4BF-0B638669B2D1}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{C9BF395E-17FF-4AD6-821D-91907F33F5B7}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{1B7578FB-958F-4889-B147-8221CDFC6C4E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -36,66 +36,66 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}.Release|Any CPU.Build.0 = Release|Any CPU {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Release|Any CPU.Build.0 = Release|Any CPU
{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}.Release|Any CPU.Build.0 = Release|Any CPU {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Release|Any CPU.Build.0 = Release|Any CPU
{5A62A666-A8D9-4604-ABBD-1B7753B91472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A62A666-A8D9-4604-ABBD-1B7753B91472}.Debug|Any CPU.Build.0 = Debug|Any CPU {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A62A666-A8D9-4604-ABBD-1B7753B91472}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A62A666-A8D9-4604-ABBD-1B7753B91472}.Release|Any CPU.Build.0 = Release|Any CPU {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Release|Any CPU.Build.0 = Release|Any CPU
{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}.Debug|Any CPU.Build.0 = Debug|Any CPU {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}.Release|Any CPU.ActiveCfg = Release|Any CPU {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{23D7D30C-E0CF-4AEB-8DDF-AC14C70F1D19}.Release|Any CPU.Build.0 = Release|Any CPU {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Release|Any CPU.Build.0 = Release|Any CPU
{283379F3-2B5E-497E-83C6-AFD53A27FD56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{283379F3-2B5E-497E-83C6-AFD53A27FD56}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{283379F3-2B5E-497E-83C6-AFD53A27FD56}.Release|Any CPU.ActiveCfg = Release|Any CPU {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{283379F3-2B5E-497E-83C6-AFD53A27FD56}.Release|Any CPU.Build.0 = Release|Any CPU {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Release|Any CPU.Build.0 = Release|Any CPU
{094D67CC-5605-4F32-891F-F026CF6068D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{094D67CC-5605-4F32-891F-F026CF6068D0}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{094D67CC-5605-4F32-891F-F026CF6068D0}.Release|Any CPU.ActiveCfg = Release|Any CPU {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{094D67CC-5605-4F32-891F-F026CF6068D0}.Release|Any CPU.Build.0 = Release|Any CPU {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Release|Any CPU.Build.0 = Release|Any CPU
{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1817C154-9111-4C45-A19A-609A5717C1FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}.Debug|Any CPU.Build.0 = Debug|Any CPU {1817C154-9111-4C45-A19A-609A5717C1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}.Release|Any CPU.ActiveCfg = Release|Any CPU {1817C154-9111-4C45-A19A-609A5717C1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}.Release|Any CPU.Build.0 = Release|Any CPU {1817C154-9111-4C45-A19A-609A5717C1FA}.Release|Any CPU.Build.0 = Release|Any CPU
{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{743D1061-2AAE-4800-8596-CC2DAF2EA7BB}.Release|Any CPU.Build.0 = Release|Any CPU {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Release|Any CPU.Build.0 = Release|Any CPU
{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B7DDBC8-A2BC-45E3-AB85-4B4B1008E24B}.Release|Any CPU.Build.0 = Release|Any CPU {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Release|Any CPU.Build.0 = Release|Any CPU
{BE38C520-803E-40AD-9370-E6D143B9A5F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE38C520-803E-40AD-9370-E6D143B9A5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE38C520-803E-40AD-9370-E6D143B9A5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE38C520-803E-40AD-9370-E6D143B9A5F8}.Release|Any CPU.Build.0 = Release|Any CPU {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Release|Any CPU.Build.0 = Release|Any CPU
{FD466C1A-5A7A-4764-83DB-439CD977917D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD466C1A-5A7A-4764-83DB-439CD977917D}.Debug|Any CPU.Build.0 = Debug|Any CPU {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD466C1A-5A7A-4764-83DB-439CD977917D}.Release|Any CPU.ActiveCfg = Release|Any CPU {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD466C1A-5A7A-4764-83DB-439CD977917D}.Release|Any CPU.Build.0 = Release|Any CPU {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Release|Any CPU.Build.0 = Release|Any CPU
{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}.Release|Any CPU.ActiveCfg = Release|Any CPU {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}.Release|Any CPU.Build.0 = Release|Any CPU {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Release|Any CPU.Build.0 = Release|Any CPU
{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}.Release|Any CPU.Build.0 = Release|Any CPU {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Release|Any CPU.Build.0 = Release|Any CPU
{7EE18181-5891-405A-9590-E2D4EE5A2772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7EE18181-5891-405A-9590-E2D4EE5A2772}.Debug|Any CPU.Build.0 = Debug|Any CPU {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7EE18181-5891-405A-9590-E2D4EE5A2772}.Release|Any CPU.ActiveCfg = Release|Any CPU {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7EE18181-5891-405A-9590-E2D4EE5A2772}.Release|Any CPU.Build.0 = Release|Any CPU {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Release|Any CPU.Build.0 = Release|Any CPU
{C9BF395E-17FF-4AD6-821D-91907F33F5B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9BF395E-17FF-4AD6-821D-91907F33F5B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9BF395E-17FF-4AD6-821D-91907F33F5B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9BF395E-17FF-4AD6-821D-91907F33F5B7}.Release|Any CPU.Build.0 = Release|Any CPU {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

10
OpenSim/OpenSim.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{FD466C1A-5A7A-4764-83DB-439CD977917D}</ProjectGuid> <ProjectGuid>{631F3710-2C88-4AD4-AA6E-FB06BC909769}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon></ApplicationIcon>
@ -82,25 +82,25 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
<Name>OpenSim.Framework</Name> <Name>OpenSim.Framework</Name>
<Project>{6CE3530E-1D8E-47D8-9B6D-82A86E71D657}</Project> <Project>{1817C154-9111-4C45-A19A-609A5717C1FA}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{4E3D1135-5AD9-4C23-BB9A-E4FCCA4B0BC7}</Project> <Project>{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
<Name>OpenSim.Physics.Manager</Name> <Name>OpenSim.Physics.Manager</Name>
<Project>{7D98B8F9-1409-40DD-8A8F-9B7669761B6C}</Project> <Project>{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
<Name>OpenSim.RegionServer</Name> <Name>OpenSim.RegionServer</Name>
<Project>{90F935D0-00A6-4A5D-82F0-BB7FB8AFC99D}</Project> <Project>{D385B640-E037-419A-AC83-5CB6E66D9FF3}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>

10
Prebuild/Prebuild.sln
View File

@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{6A56621D-A328-4E23-96E3-0514A3817BAF}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -8,10 +8,10 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}.Release|Any CPU.Build.0 = Release|Any CPU {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
Prebuild/src/Prebuild.csproj
View File

@ -3,7 +3,7 @@
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{BEF662A4-BA6D-4BDB-BE04-4E6055E9D276}</ProjectGuid> <ProjectGuid>{6A56621D-A328-4E23-96E3-0514A3817BAF}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon> <ApplicationIcon>App.ico</ApplicationIcon>

10
Servers/BaseHttpServer.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Servers
{
public class BaseHttpServer
{
}
}

42
Servers/OpenSim.Servers.csproj
View File

@ -1,12 +1,13 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{2EF6000C-A72B-4CBF-99A8-ECDAE8ED41DE}</ProjectGuid> <ProjectGuid>{570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim.Servers</AssemblyName> <AssemblyName>OpenSim.Servers</AssemblyName>
@ -15,9 +16,11 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder> <AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>OpenSim.Servers</RootNamespace> <RootNamespace>OpenSim.Servers</RootNamespace>
<StartupObject></StartupObject> <StartupObject>
</StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
@ -28,7 +31,8 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile>
</DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>False</Optimize>
@ -37,7 +41,8 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@ -46,7 +51,8 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile>
</DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>True</Optimize>
@ -55,26 +61,28 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" > <Reference Include="System">
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Xml" > <Reference Include="System.Data" />
<Reference Include="System.Xml">
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenSim.Framework.dll" > <Reference Include="OpenSim.Framework.dll">
<HintPath>..\bin\OpenSim.Framework.dll</HintPath> <HintPath>..\bin\OpenSim.Framework.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenSim.Framework.Console.dll" > <Reference Include="OpenSim.Framework.Console.dll">
<HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath> <HintPath>..\bin\OpenSim.Framework.Console.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll">
<HintPath>..\bin\libsecondlife.dll</HintPath> <HintPath>..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
@ -82,9 +90,7 @@
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="dummy.cs"> <Compile Include="BaseHttpServer.cs" />
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>
@ -93,4 +99,4 @@
<PostBuildEvent> <PostBuildEvent>
</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
Servers/OpenSim.Servers.dll.build
View File

@ -11,7 +11,7 @@
<resources prefix="OpenSim.Servers" dynamicprefix="true" > <resources prefix="OpenSim.Servers" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="dummy.cs" /> <include name="BaseHttpServer.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

1
Servers/dummy.cs
View File

@ -1 +0,0 @@
// This here because prebuild breaks nant build on empty fileset, ie a project containing no files

3
prebuild.xml
View File

@ -354,9 +354,10 @@
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Reference name="Axiom.MathLib.dll"/> <Reference name="Axiom.MathLib.dll"/>
<Reference name="Db4objects.Db4o.dll"/> <Reference name="Db4objects.Db4o.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Physics.Manager"/> <Reference name="OpenSim.Physics.Manager"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Servers"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>