this is step 2 of 2 of the OpenSim.Region.Environment refactor.

NOTHING has been deleted or moved off to forge at this point.  what
has happened is that OpenSim.Region.Environment.Modules has been split
in two:

- OpenSim.Region.CoreModules: all those modules that are either
  directly or indirectly referenced from  other  OpenSim packages, or
  that provide functionality that the OpenSim developer community
  considers core functionality:

      CoreModules/Agent/AssetTransaction
      CoreModules/Agent/Capabilities
      CoreModules/Agent/TextureDownload
      CoreModules/Agent/TextureSender
      CoreModules/Agent/TextureSender/Tests
      CoreModules/Agent/Xfer
      CoreModules/Avatar/AvatarFactory
      CoreModules/Avatar/Chat/ChatModule
      CoreModules/Avatar/Combat
      CoreModules/Avatar/Currency/SampleMoney
      CoreModules/Avatar/Dialog
      CoreModules/Avatar/Friends
      CoreModules/Avatar/Gestures
      CoreModules/Avatar/Groups
      CoreModules/Avatar/InstantMessage
      CoreModules/Avatar/Inventory
      CoreModules/Avatar/Inventory/Archiver
      CoreModules/Avatar/Inventory/Transfer
      CoreModules/Avatar/Lure
      CoreModules/Avatar/ObjectCaps
      CoreModules/Avatar/Profiles
      CoreModules/Communications/Local
      CoreModules/Communications/REST
      CoreModules/Framework/EventQueue
      CoreModules/Framework/InterfaceCommander
      CoreModules/Hypergrid
      CoreModules/InterGrid
      CoreModules/Scripting/DynamicTexture
      CoreModules/Scripting/EMailModules
      CoreModules/Scripting/HttpRequest
      CoreModules/Scripting/LoadImageURL
      CoreModules/Scripting/VectorRender
      CoreModules/Scripting/WorldComm
      CoreModules/Scripting/XMLRPC
      CoreModules/World/Archiver
      CoreModules/World/Archiver/Tests
      CoreModules/World/Estate
      CoreModules/World/Land
      CoreModules/World/Permissions
      CoreModules/World/Serialiser
      CoreModules/World/Sound
      CoreModules/World/Sun
      CoreModules/World/Terrain
      CoreModules/World/Terrain/DefaultEffects
      CoreModules/World/Terrain/DefaultEffects/bin
      CoreModules/World/Terrain/DefaultEffects/bin/Debug
      CoreModules/World/Terrain/Effects
      CoreModules/World/Terrain/FileLoaders
      CoreModules/World/Terrain/FloodBrushes
      CoreModules/World/Terrain/PaintBrushes
      CoreModules/World/Terrain/Tests
      CoreModules/World/Vegetation
      CoreModules/World/Wind
      CoreModules/World/WorldMap

- OpenSim.Region.OptionalModules: all those modules that are not core
  modules:

      OptionalModules/Avatar/Chat/IRC-stuff
      OptionalModules/Avatar/Concierge
      OptionalModules/Avatar/Voice/AsterixVoice
      OptionalModules/Avatar/Voice/SIPVoice
      OptionalModules/ContentManagementSystem
      OptionalModules/Grid/Interregion
      OptionalModules/Python
      OptionalModules/SvnSerialiser
      OptionalModules/World/NPC
      OptionalModules/World/TreePopulator
0.6.3-post-fixes
Dr Scofield 2009-02-10 13:10:57 +00:00
parent a1393db7f0
commit 180be7de07
173 changed files with 320 additions and 390 deletions

View File

@ -43,7 +43,6 @@
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll"/>
<include name="../bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll"/>
<include name="../bin/OpenSim.Region.CoreModules.Tests.dll"/>
<include name="../bin/OpenSim.Region.Environment.Tests.dll"/>
<include name="../bin/OpenSim.Region.Framework.Tests.dll"/>
<include name="../bin/OpenSim.Data.SQLite.Tests.dll"/>
<include name="../bin/OpenSim.Data.MySQL.Tests.dll"/>

View File

@ -40,7 +40,6 @@
<include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
<include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
<include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
<include name="./bin/OpenSim.Region.Environment.Tests.dll" />
<include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
<include name="./bin/OpenSim.Region.Framework.Tests.dll" />
<include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
@ -110,13 +109,13 @@
<exec program="mono">
<arg value="--debug" />
<arg value="--profile=monocov:outfile=./cov/OpenSim.Region.Environment.cov,+[OpenSim.Region.Environment]" />
<arg value="--profile=monocov:outfile=./cov/OpenSim.Region.CoreModules.cov,+[OpenSim.Region.CoreModules]" />
<arg value="/usr/lib/nunit/nunit-console.exe" />
<arg value="./bin/OpenSim.Region.Environment.Tests.dll" />
<arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
</exec>
<delete dir="./cov/OpenSim.Region.Environment" />
<delete dir="./cov/OpenSim.Region.CoreModules" />
<exec program="monocov">
<arg value="--export-html=./cov/OpenSim.Region.Environment ./cov/OpenSim.Region.Environment.cov" />
<arg value="--export-html=./cov/OpenSim.Region.CoreModules ./cov/OpenSim.Region.CoreModules.cov" />
</exec>
<exec program="mono">
@ -170,7 +169,6 @@
<include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
<include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
<include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
<include name="./bin/OpenSim.Region.Environment.Tests.dll" />
<include name="./bin/OpenSim.Region.Framework.Tests.dll" />
<include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
<include name="./bin/OpenSim.Data.MySQL.Tests.dll" />

View File

@ -34,10 +34,10 @@ using OpenSim.Framework;
using OpenSim.Framework.RegionLoader.Filesystem;
using OpenSim.Framework.RegionLoader.Web;
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.CoreModules.Scripting.DynamicTexture;
using OpenSim.Region.CoreModules.Avatar.InstantMessage;
using OpenSim.Region.CoreModules.Scripting.LoadImageURL;
using OpenSim.Region.CoreModules.Scripting.XMLRPC;
using OpenSim.Region.CoreModules.Agent.AssetTransaction;
namespace OpenSim.ApplicationPlugins.LoadRegions

View File

@ -39,7 +39,7 @@ using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.CoreModules.World.Terrain;
using System.Collections.Generic;
namespace OpenSim.ApplicationPlugins.RemoteController

View File

@ -35,7 +35,7 @@ using OpenSim.Framework;
using OpenSim.Data;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Land;
using OpenSim.Region.CoreModules.World.Land;
using OpenMetaverse;
namespace OpenSim.Data.Tests

View File

@ -43,7 +43,7 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.Hypergrid;
using OpenSim.Region.Environment;
using OpenSim.Region.CoreModules;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

View File

@ -41,8 +41,8 @@ using OpenSim.Framework.Console;
using OpenSim.Framework.Statistics;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver;
using Timer=System.Timers.Timer;
using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
using Timer = System.Timers.Timer;
namespace OpenSim
{

View File

@ -44,7 +44,7 @@ using OpenSim.Framework.Statistics;
using OpenSim.Region.ClientStack;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.Communications.OGS1;
using OpenSim.Region.Environment;
using OpenSim.Region.CoreModules;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

View File

@ -35,7 +35,7 @@ using OpenSim.Region.ClientStack;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment
namespace OpenSim.Region.ClientStack
{
public class ClientStackManager
{

View File

@ -798,7 +798,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>
/// Starts up the timers to check the client and resend unacked packets
/// Adds the client to the OpenSim.Region.Environment.Scenes.Scene
/// Adds the client to the OpenSim.Region.Framework.Scenes.Scene
/// </summary>
protected virtual void InitNewClient()
{

View File

@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment;
using OpenSim.Region.CoreModules;
using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.ClientStack

View File

@ -38,7 +38,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{
public class AvatarFactoryModule : IAvatarFactory, IRegionModule
{

View File

@ -39,7 +39,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Chat
namespace OpenSim.Region.CoreModules.Avatar.Chat
{
public class ChatModule : IRegionModule
{

View File

@ -41,7 +41,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Avatar.Combat.CombatModule
namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
{
public class CombatModule : IRegionModule
{

View File

@ -42,7 +42,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
{
/// <summary>
/// Demo Economy/Money Module. This is not a production quality money/economy module!

View File

@ -34,7 +34,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
namespace OpenSim.Region.CoreModules.Avatar.Dialog
{
public class DialogModule : IRegionModule, IDialogModule
{

View File

@ -39,7 +39,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Friends
namespace OpenSim.Region.CoreModules.Avatar.Friends
{
/*
This module handles adding/removing friends, and the the presence

View File

@ -35,7 +35,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using System.Reflection;
namespace OpenSim.Region.Environment.Modules.Avatar.Gestures
namespace OpenSim.Region.CoreModules.Avatar.Gestures
{
public class GesturesModule : IRegionModule
{

View File

@ -35,7 +35,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Groups
namespace OpenSim.Region.CoreModules.Avatar.Groups
{
public class GroupsModule : IRegionModule
{

View File

@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
{
public class InstantMessageModule : IRegionModule
{

View File

@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
{
public class MessageTransferModule : IRegionModule, IMessageTransferModule
{

View File

@ -39,7 +39,7 @@ using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
{
public class PresenceModule : IRegionModule, IPresenceModule
{

View File

@ -33,15 +33,15 @@ using System.Reflection;
using System.Xml;
using OpenMetaverse;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Region.CoreModules.World.Archiver;
using OpenSim.Region.CoreModules.World.Serialiser;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using log4net;
using OpenSim.Region.Environment.Modules.World.Serialiser;
namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
public class InventoryArchiveReadRequest
{

View File

@ -33,14 +33,14 @@ using System.Reflection;
using System.Xml;
using OpenMetaverse;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Region.CoreModules.World.Archiver;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using log4net;
namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Archiver
namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
public class InventoryArchiveWriteRequest
{

View File

@ -37,7 +37,7 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
{
public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
{

View File

@ -40,7 +40,7 @@ using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Lure
namespace OpenSim.Region.CoreModules.Avatar.Lure
{
public class LureModule : IRegionModule
{

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.Avatar.ObjectCaps
namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
{
public class ObjectAdd : IRegionModule
{

View File

@ -35,7 +35,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
namespace OpenSim.Region.CoreModules.Avatar.Profiles
{
public class AvatarProfilesModule : IRegionModule
{

View File

@ -41,7 +41,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Communications.Local
namespace OpenSim.Region.CoreModules.Communications.Local
{
public class LocalInterregionComms : IRegionModule, IInterregionCommsOut, IInterregionCommsIn
{

View File

@ -45,9 +45,9 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Hypergrid;
using OpenSim.Region.Environment.Modules.Communications.Local;
using OpenSim.Region.CoreModules.Communications.Local;
namespace OpenSim.Region.Environment.Modules.Communications.REST
namespace OpenSim.Region.CoreModules.Communications.REST
{
public class RESTInterregionComms : IRegionModule, IInterregionCommsOut
{

View File

@ -52,7 +52,7 @@ using OSDArray = OpenMetaverse.StructuredData.OSDArray;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
namespace OpenSim.Region.CoreModules.Framework.EventQueue
{
public struct QueueItem
{
@ -617,7 +617,7 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue
public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID)
{
OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
OSD item = EventQueueHelper.ParcelProperties(parcelPropertiesPacket);
Enqueue(item, avatarID);
}

View File

@ -31,7 +31,7 @@ using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenMetaverse.StructuredData;
namespace OpenSim.Region.Environment
namespace OpenSim.Region.CoreModules.Framework.EventQueue
{
public class EventQueueHelper
{

View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
{
/// <summary>
/// A single function call encapsulated in a class which enforces arguments when passing around as Object[]'s.

View File

@ -33,7 +33,7 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.Framework.InterfaceCommander
namespace OpenSim.Region.CoreModules.Framework.InterfaceCommander
{
/// <summary>
/// A class to enable modules to register console and script commands, which enforces typing and valid input.

View File

@ -45,7 +45,7 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Grid.AssetServer;
using OpenSim.Data;
namespace OpenSim.Region.Environment.Modules.Hypergrid
namespace OpenSim.Region.CoreModules.Hypergrid
{
public class HGStandaloneAssetService : IRegionModule
{

View File

@ -40,7 +40,7 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Hypergrid
namespace OpenSim.Region.CoreModules.Hypergrid
{
public class HGStandaloneInventoryService : IRegionModule
{

View File

@ -50,14 +50,14 @@ using OpenSim.Framework.Servers;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Types;
using OpenSim.Region.Environment.Modules.World.WorldMap;
using OpenSim.Region.CoreModules.World.WorldMap;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
using OSD = OpenMetaverse.StructuredData.OSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray;
namespace OpenSim.Region.Environment.Modules.Hypergrid
namespace OpenSim.Region.CoreModules.Hypergrid
{
public class HGWorldMapModule : WorldMapModule, IRegionModule
{

View File

@ -51,7 +51,7 @@ using OSD = OpenMetaverse.StructuredData.OSD;
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
using OSDArray = OpenMetaverse.StructuredData.OSDArray;
namespace OpenSim.Region.Environment.Modules.InterGrid
namespace OpenSim.Region.CoreModules.InterGrid
{
public struct OGPState
{

View File

@ -36,7 +36,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Scripting.DynamicTexture
namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
{
public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
{

View File

@ -38,7 +38,7 @@ using Nini.Config;
using DotNetOpenMail;
using DotNetOpenMail.SmtpAuth;
namespace OpenSim.Region.Environment.Modules.Scripting.EmailModules
namespace OpenSim.Region.CoreModules.Scripting.EmailModules
{
public class EmailModule : IEmailModule
{

View File

@ -82,7 +82,7 @@ using System.Collections;
*
* **************************************************/
namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
{
public class HttpRequestModule : IRegionModule, IHttpRequestModule
{

View File

@ -35,7 +35,7 @@ using Nini.Config;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL
namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
{
public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
{

View File

@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Scenes;
//using Cairo;
namespace OpenSim.Region.Environment.Modules.Scripting.VectorRender
namespace OpenSim.Region.CoreModules.Scripting.VectorRender
{
public class VectorRenderModule : IRegionModule, IDynamicTextureRender
{

View File

@ -83,7 +83,7 @@ using OpenSim.Region.Framework.Scenes;
*
* **************************************************/
namespace OpenSim.Region.Environment.Modules.Scripting.WorldComm
namespace OpenSim.Region.CoreModules.Scripting.WorldComm
{
public class WorldCommModule : IRegionModule, IWorldComm
{

View File

@ -73,7 +73,7 @@ using OpenSim.Region.Framework.Scenes;
*
* **************************************************/
namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
{
public class XMLRPCModule : IRegionModule, IXMLRPC
{

View File

@ -28,7 +28,7 @@
using System.Collections.Generic;
using OpenMetaverse;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Constants for the archiving module

View File

@ -38,9 +38,9 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.CoreModules.World.Terrain;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Handles an individual archive read request

View File

@ -35,10 +35,10 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.CoreModules.World.Serialiser;
using OpenSim.Region.CoreModules.World.Terrain;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Method called when all the necessary assets for an archive request have been received.

View File

@ -29,8 +29,8 @@ using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.CoreModules.World.Serialiser;
using OpenSim.Region.CoreModules.World.Terrain;
using System;
using System.Collections.Generic;
using System.IO;
@ -42,7 +42,7 @@ using OpenMetaverse;
using log4net;
using Nini.Config;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Prepare to write out an archive.

View File

@ -35,9 +35,9 @@ using Nini.Config;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.CoreModules.World.Serialiser;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// This module loads and saves OpenSimulator archives

View File

@ -33,7 +33,7 @@ using OpenMetaverse;
using log4net;
using OpenSim.Framework;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Archives assets

View File

@ -35,7 +35,7 @@ using log4net;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Dearchives assets

View File

@ -36,7 +36,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Encapsulate the asynchronous requests for the assets required for an archive operation

View File

@ -32,7 +32,7 @@ using System.Xml;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Serialize and deserialize region settings for an archive file format.

View File

@ -31,7 +31,7 @@ using System.Reflection;
using System.Text;
using log4net;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Temporary code to do the bare minimum required to read a tar archive for our purposes

View File

@ -32,7 +32,7 @@ using System.Text;
using System.Reflection;
using log4net;
namespace OpenSim.Region.Environment.Modules.World.Archiver
namespace OpenSim.Region.CoreModules.World.Archiver
{
/// <summary>
/// Temporary code to produce a tar archive in tar v7 format

View File

@ -33,13 +33,13 @@ using NUnit.Framework.SyntaxHelpers;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.World.Archiver;
using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.CoreModules.World.Archiver;
using OpenSim.Region.CoreModules.World.Serialiser;
using OpenSim.Region.CoreModules.World.Terrain;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests
namespace OpenSim.Region.CoreModules.World.Archiver.Tests
{
[TestFixture]
public class ArchiverTests

View File

@ -35,7 +35,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Estate
namespace OpenSim.Region.CoreModules.World.Estate
{
public class EstateManagementModule : IEstateModule
{
@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
TerrainUploader = null;
}
remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>();
OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
if (terr != null)
{
@ -544,7 +544,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
{
// Save terrain here
OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>();
OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
if (terr != null)
{

View File

@ -35,7 +35,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Estate
namespace OpenSim.Region.CoreModules.World.Estate
{
public class EstateTerrainXferHandler

View File

@ -32,7 +32,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Land
namespace OpenSim.Region.CoreModules.World.Land
{
public class LandChannel : ILandChannel
{

View File

@ -40,7 +40,7 @@ using OpenSim.Framework.Communications.Capabilities;
using OpenSim.Region.Physics.Manager;
using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
namespace OpenSim.Region.Environment.Modules.World.Land
namespace OpenSim.Region.CoreModules.World.Land
{
// used for caching
internal class ExtendedLandData {

View File

@ -34,7 +34,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Land
namespace OpenSim.Region.CoreModules.World.Land
{
/// <summary>
/// Keeps track of a specific piece of land's information

View File

@ -36,10 +36,10 @@ using OpenSim;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Framework;
using OpenSim.Region.CoreModules.Framework;
using OpenSim.Framework.Communications.Cache;
namespace OpenSim.Region.Environment.Modules.World.Permissions
namespace OpenSim.Region.CoreModules.World.Permissions
{
public class PermissionsModule : IRegionModule
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Serialiser
namespace OpenSim.Region.CoreModules.World.Serialiser
{
internal interface IFileSerialiser
{

View File

@ -32,7 +32,7 @@ using System.Text;
using System.Xml;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Serialiser
namespace OpenSim.Region.CoreModules.World.Serialiser
{
internal class SerialiseObjects : IFileSerialiser
{

View File

@ -25,11 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders;
using OpenSim.Region.CoreModules.World.Terrain;
using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Serialiser
namespace OpenSim.Region.CoreModules.World.Serialiser
{
internal class SerialiseTerrain : IFileSerialiser
{

View File

@ -32,9 +32,9 @@ using OpenMetaverse;
using Nini.Config;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander;
using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
namespace OpenSim.Region.Environment.Modules.World.Serialiser
namespace OpenSim.Region.CoreModules.World.Serialiser
{
public class SerialiserModule : IRegionModule, IRegionSerialiserModule
{

View File

@ -34,7 +34,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.World.Sound
namespace OpenSim.Region.CoreModules.World.Sound
{
public class SoundModule : IRegionModule, ISoundModule
{

View File

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

View File

@ -27,8 +27,8 @@
using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes;
using OpenSim.Region.CoreModules.World.Terrain;
using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
{

View File

@ -27,9 +27,9 @@
using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes;
using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
namespace OpenSim.Region.CoreModules.World.Terrain.Effects
{
internal class CookieCutter : ITerrainEffect
{

View File

@ -28,7 +28,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.Effects
namespace OpenSim.Region.CoreModules.World.Terrain.Effects
{
internal class DefaultTerrainGenerator : ITerrainEffect
{

View File

@ -30,7 +30,7 @@ using System.Drawing.Imaging;
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
/// <summary>
/// A generic windows bitmap loader.

View File

@ -30,7 +30,7 @@ using System.Drawing.Imaging;
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
internal class GIF : GenericSystemDrawing
{

View File

@ -32,7 +32,7 @@ using System.IO;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
/// <summary>
/// A virtual class designed to have methods overloaded,

View File

@ -31,7 +31,7 @@ using System.Drawing.Imaging;
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
public class JPEG : ITerrainLoader
{

View File

@ -30,7 +30,7 @@ using System.IO;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
public class LLRAW : ITerrainLoader
{

View File

@ -30,7 +30,7 @@ using System.Drawing.Imaging;
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
internal class PNG : GenericSystemDrawing
{

View File

@ -29,7 +29,7 @@ using System.IO;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
public class RAW32 : ITerrainLoader
{

View File

@ -30,7 +30,7 @@ using System.Drawing.Imaging;
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
internal class TIFF : GenericSystemDrawing
{

View File

@ -31,7 +31,7 @@ using System.Text;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders
namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
{
/// <summary>
/// Terragen File Format Loader

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class FlattenArea : ITerrainFloodEffect
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class LowerArea : ITerrainFloodEffect
{

View File

@ -29,7 +29,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class NoiseArea : ITerrainFloodEffect
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class RaiseArea : ITerrainFloodEffect
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class RevertArea : ITerrainFloodEffect
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
{
public class SmoothArea : ITerrainFloodEffect
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain
namespace OpenSim.Region.CoreModules.World.Terrain
{
public interface ITerrainEffect
{

View File

@ -28,7 +28,7 @@
using System;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain
namespace OpenSim.Region.CoreModules.World.Terrain
{
public interface ITerrainFloodEffect
{

View File

@ -28,7 +28,7 @@
using System.IO;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain
namespace OpenSim.Region.CoreModules.World.Terrain
{
public interface ITerrainLoader
{

View File

@ -30,7 +30,7 @@ using System.IO;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Region.Environment.Modules.World.Terrain
namespace OpenSim.Region.CoreModules.World.Terrain
{
public interface ITerrainModule
{

View File

@ -27,7 +27,7 @@
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain
namespace OpenSim.Region.CoreModules.World.Terrain
{
public interface ITerrainPaintableEffect
{

View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
/// <summary>
/// Hydraulic Erosion Brush

View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class FlattenSphere : ITerrainPaintableEffect
{

View File

@ -28,7 +28,7 @@
using System;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class LowerSphere : ITerrainPaintableEffect
{

View File

@ -30,7 +30,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class NoiseSphere : ITerrainPaintableEffect
{

View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
/// <summary>
/// Speed-Optimised Hybrid Erosion Brush

View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class RaiseSphere : ITerrainPaintableEffect
{

View File

@ -29,7 +29,7 @@ using System;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class RevertSphere : ITerrainPaintableEffect
{

View File

@ -28,7 +28,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
{
public class SmoothSphere : ITerrainPaintableEffect
{

Some files were not shown because too many files have changed in this diff Show More