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

starting phase 2 of the OpenSim.Region.Environment commit: relocating 

OpenSim.Region.Environment.Modules.Agent en bloc to OpenSim.Region.CoreModules
0.6.3-post-fixes
Dr Scofield 2009-02-09 09:16:15 +00:00
parent 2c4ccc2347
commit a89d097355
16 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
using OpenSim.Region.CoreModules.Agent.AssetTransaction;
namespace OpenSim.ApplicationPlugins.LoadRegions
{

2
OpenSim/Region/Application/HGOpenSimNode.cs
View File

@ -146,7 +146,7 @@ namespace OpenSim
m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
}
public void RunCommand(string module, string[] cp)
void RunCommand(string module, string[] cp)
{
List<string> cmdparams = new List<string>(cp);
if (cmdparams.Count < 1)

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs → OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
/*
public class AgentAssetTransactionsManager

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs → OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
View File

@ -32,7 +32,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
/// <summary>
/// Manage asset transactions for a single agent.

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs → OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions
{

2
OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs → OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
View File

@ -35,7 +35,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
{
public class AssetXferUploader
{

2
OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs → OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
View File

@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
namespace OpenSim.Region.Environment.Modules.Agent.Capabilities
namespace OpenSim.Region.CoreModules.Agent.Capabilities
{
public class CapabilitiesModule : IRegionModule, ICapabilitiesModule
{

2
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs → OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache;
using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
namespace OpenSim.Region.CoreModules.Agent.TextureDownload
{
public class TextureDownloadModule : IRegionModule
{

2
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs → OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -32,7 +32,7 @@ using OpenMetaverse.Packets;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
namespace OpenSim.Region.CoreModules.Agent.TextureDownload
{
/// <summary>
/// Sends a 'texture not found' packet back to the client

2
OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs → OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
View File

@ -35,7 +35,7 @@ using OpenSim.Framework.Statistics;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
namespace OpenSim.Region.CoreModules.Agent.TextureDownload
{
/// <summary>
/// This module sets up texture senders in response to client texture requests, and places them on a

2
OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs → OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
View File

@ -39,7 +39,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
public class J2KDecoderModule : IRegionModule, IJ2KDecoder
{

2
OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs → OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs
View File

@ -33,7 +33,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
[TestFixture]
public class UserTextureSenderTests

2
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs → OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs
View File

@ -32,7 +32,7 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
/// <summary>
/// A TextureSender handles the process of receiving a texture requested by the client from the

2
OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs → OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
View File

@ -33,7 +33,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Agent.Xfer
namespace OpenSim.Region.CoreModules.Agent.Xfer
{
public class XferModule : IRegionModule, IXfer
{

2
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -36,7 +36,7 @@ using OpenSim.Region.Physics.Manager;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Agent.Capabilities;
using OpenSim.Region.CoreModules.Agent.Capabilities;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Tests.Common.Setup

48
prebuild.xml
View File

@ -842,6 +842,52 @@
</Files>
</Project>
<Project name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
<Configuration name="Debug">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<Configuration name="Release">
<Options>
<OutputPath>../../../bin/</OutputPath>
</Options>
</Configuration>
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System" localCopy="false"/>
<Reference name="System.Xml"/>
<Reference name="System.Drawing"/>
<Reference name="System.Runtime.Remoting"/>
<Reference name="System.Web"/>
<Reference name="OpenMetaverseTypes.dll"/>
<Reference name="OpenMetaverse.StructuredData.dll"/>
<Reference name="OpenMetaverse.dll"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Data" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Grid.AssetServer"/>
<!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
<Reference name="log4net.dll"/>
<Reference name="DotNetOpenMail.dll"/>
<Files>
<Match pattern="*.cs" recurse="true">
<Exclude name="Tests" pattern="Tests" />
</Match>
</Files>
</Project>
<Project name="OpenSim.Region.Environment" path="OpenSim/Region/Environment" type="Library">
<Configuration name="Debug">
<Options>
@ -1162,6 +1208,7 @@
<Reference name="Nini.dll" />
<Reference name="OpenSim"/>
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Framework"/>
@ -2326,6 +2373,7 @@
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Region.Physics.Manager"/>