Nonowrking intermadiate commit,, DO NOT USE
parent
e24be9aac9
commit
72adbd976c
|
@ -26,10 +26,10 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using OpenSim.Servers.Base;
|
using OpenSim.Server.Base;
|
||||||
using OpenSim.Servers.AssetServer.Handlers;
|
using OpenSim.Server.AssetServer.Handlers;
|
||||||
|
|
||||||
namespace OpenSim.Servers.AssetServer
|
namespace OpenSim.Server.AssetServer
|
||||||
{
|
{
|
||||||
public class AssetServer
|
public class AssetServer
|
||||||
{
|
{
|
|
@ -33,7 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Nini.Config;
|
using Nini.Config;
|
||||||
|
|
||||||
namespace OpenSim.Servers.Base
|
namespace OpenSim.Server.Base
|
||||||
{
|
{
|
||||||
public class HttpServerBase : ServicesServerBase
|
public class HttpServerBase : ServicesServerBase
|
||||||
{
|
{
|
|
@ -32,7 +32,7 @@ using System.Xml;
|
||||||
using System.Xml.Serialization;
|
using System.Xml.Serialization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
namespace OpenSim.Servers.Base
|
namespace OpenSim.Server.Base
|
||||||
{
|
{
|
||||||
public static class ServerUtils
|
public static class ServerUtils
|
||||||
{
|
{
|
|
@ -37,7 +37,7 @@ using log4net.Core;
|
||||||
using log4net.Repository;
|
using log4net.Repository;
|
||||||
using Nini.Config;
|
using Nini.Config;
|
||||||
|
|
||||||
namespace OpenSim.Servers.Base
|
namespace OpenSim.Server.Base
|
||||||
{
|
{
|
||||||
public class ServicesServerBase
|
public class ServicesServerBase
|
||||||
{
|
{
|
12
prebuild.xml
12
prebuild.xml
|
@ -1359,7 +1359,7 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
<Project name="OpenSim.Servers.Base" path="OpenSim/Servers/Base" type="Library">
|
<Project name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
@ -1407,7 +1407,7 @@
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||||
<Reference name="OpenSim.Servers.Base"/>
|
<Reference name="OpenSim.Server.Base"/>
|
||||||
<Reference name="OpenSim.Services.Base" />
|
<Reference name="OpenSim.Services.Base" />
|
||||||
<Reference name="OpenSim.Services.Interfaces"/>
|
<Reference name="OpenSim.Services.Interfaces"/>
|
||||||
<Reference name="Nini.dll" />
|
<Reference name="Nini.dll" />
|
||||||
|
@ -1418,7 +1418,7 @@
|
||||||
</Files>
|
</Files>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
<Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/AssetServer" type="Exe">
|
<Project name="OpenSim.Server.AssetServer" path="OpenSim/Server/AssetServer" type="Exe">
|
||||||
<Configuration name="Debug">
|
<Configuration name="Debug">
|
||||||
<Options>
|
<Options>
|
||||||
<OutputPath>../../../bin/</OutputPath>
|
<OutputPath>../../../bin/</OutputPath>
|
||||||
|
@ -1438,8 +1438,8 @@
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
|
||||||
<Reference name="OpenSim.Servers.Base"/>
|
<Reference name="OpenSim.Server.Base"/>
|
||||||
<Reference name="OpenSim.Servers.AssetServer.Handlers"/>
|
<Reference name="OpenSim.Server.AssetServer.Handlers"/>
|
||||||
<Reference name="OpenSim.Services.Base" />
|
<Reference name="OpenSim.Services.Base" />
|
||||||
<Reference name="OpenSim.Services.Interfaces"/>
|
<Reference name="OpenSim.Services.Interfaces"/>
|
||||||
<Reference name="Nini.dll" />
|
<Reference name="Nini.dll" />
|
||||||
|
@ -1475,7 +1475,7 @@
|
||||||
<Reference name="OpenSim.Framework.Communications"/>
|
<Reference name="OpenSim.Framework.Communications"/>
|
||||||
<Reference name="OpenSim.Data" />
|
<Reference name="OpenSim.Data" />
|
||||||
<Reference name="OpenSim.Region.Framework" />
|
<Reference name="OpenSim.Region.Framework" />
|
||||||
<Reference name="OpenSim.Servers.Base" />
|
<Reference name="OpenSim.Server.Base" />
|
||||||
<Reference name="OpenSim.Services.Connectors" />
|
<Reference name="OpenSim.Services.Connectors" />
|
||||||
<Reference name="OpenSim.Services.Base" />
|
<Reference name="OpenSim.Services.Base" />
|
||||||
<Reference name="OpenSim.Services.Interfaces" />
|
<Reference name="OpenSim.Services.Interfaces" />
|
||||||
|
|
Loading…
Reference in New Issue