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

Refactor: Change "Servers" to "Server", since the can only be one. Break 

the handlers out of the asset server context into a generic scope.
0.6.6-post-fixes
Melanie Thielker 2009-05-18 12:36:59 +00:00
parent 72adbd976c
commit 2534078380
10 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectors/Asset/HGAssetBroker.cs
View File

@ -31,7 +31,7 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

2
OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
View File

@ -31,7 +31,7 @@ using System;
using System.Collections.Generic;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

2
OpenSim/Region/CoreModules/ServiceConnectors/User/LocalUserServiceConnector.cs
View File

@ -31,7 +31,7 @@ using log4net;
using Nini.Config;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.ServiceConnectors.User

2
OpenSim/Server/AssetServer/AssetServerMain.cs
View File

@ -27,7 +27,7 @@
using System;
using OpenSim.Server.Base;
using OpenSim.Server.AssetServer.Handlers;
using OpenSim.Server.Handlers.Asset;
namespace OpenSim.Server.AssetServer
{

5
OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs → OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
View File

@ -27,12 +27,11 @@
using System;
using Nini.Config;
using OpenSim.Servers.Base;
using OpenSim.Servers.AssetServer.Handlers;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Servers.AssetServer.Handlers
namespace OpenSim.Server.Handlers.Asset
{
public class AssetServiceConnector
{

4
OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs → OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
View File

@ -35,12 +35,12 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Servers.AssetServer.Handlers
namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerDeleteHandler : BaseStreamHandler
{

4
OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs → OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
View File

@ -35,12 +35,12 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Servers.AssetServer.Handlers
namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerGetHandler : BaseStreamHandler
{

4
OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs → OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
View File

@ -35,12 +35,12 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
using System.Xml.Serialization;
using OpenSim.Servers.Base;
using OpenSim.Server.Base;
using OpenSim.Services.Interfaces;
using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Servers.AssetServer.Handlers
namespace OpenSim.Server.Handlers.Asset
{
public class AssetServerPostHandler : BaseStreamHandler
{

2
OpenSim/SimulatorServices/RegionAssetService.cs
View File

@ -32,7 +32,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Servers.AssetServer.Handlers;
using OpenSim.Server.Handlers.Asset;
namespace OpenSim.Region.SimulatorServices
{

12
prebuild.xml
View File

@ -1387,19 +1387,19 @@
</Files>
</Project>
<Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
<Project name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../../bin/</OutputPath>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../../bin/</OutputPath>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="System.Xml"/>
<Reference name="OpenMetaverseTypes.dll"/>
@ -1439,7 +1439,7 @@
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Server.AssetServer.Handlers"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="OpenSim.Services.Base" />
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="Nini.dll" />
@ -1603,7 +1603,7 @@
<Reference name="OpenSim.Framework.Servers.HttpServer" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Servers.AssetServer.Handlers"/>
<Reference name="OpenSim.Server.Handlers"/>
<Reference name="Mono.Addins.dll" />
<Reference name="XMLRPC.dll"/>
<Reference name="Nini.dll" />