2 ...odules/Archivers/AvatarProfileArchiver.cs → ...rchivers/Profile/AvatarProfileArchiver.cs
View file
@@ -37,7 +37,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Archivers
{
/// <summary>
/// This module loads/saves the avatar's profile from/into a "AvatarProfile Archive"
4 ...ules/World/Archiver/ArchiveReadRequest.cs → ...es/Archivers/Region/ArchiveReadRequest.cs
View file
@@ -38,12 +38,12 @@
using Aurora.Framework;
using Aurora.Framework.Serialization;
using Aurora.Framework.Serialization.External;
using OpenSim.Region.CoreModules.World.Terrain;
using Aurora.Modules.Terrain;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Handles an individual archive read request
2 .../Archiver/ArchiveWriteRequestExecution.cs → ...rs/Region/ArchiveWriteRequestExecution.cs
View file
@@ -36,7 +36,7 @@
using Aurora.Framework.Serialization.External;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Method called when all the necessary assets for an archive request have been received.
2 ...rchiver/ArchiveWriteRequestPreparation.cs → .../Region/ArchiveWriteRequestPreparation.cs
View file
@@ -37,7 +37,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Prepare to write out an archive.
2 ...eModules/World/Archiver/ArchiverModule.cs → ...odules/Archivers/Region/ArchiverModule.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// This module loads and saves OpenSimulator region archives
2 ...eModules/World/Archiver/AssetsArchiver.cs → ...odules/Archivers/Region/AssetsArchiver.cs
View file
@@ -29,7 +29,7 @@
using Aurora.Framework;
using Aurora.Framework.Serialization;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Archives assets
2 ...odules/World/Archiver/AssetsDearchiver.cs → ...ules/Archivers/Region/AssetsDearchiver.cs
View file
@@ -36,7 +36,7 @@
using Aurora.Framework.Serialization;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Dearchives assets
2 ...reModules/World/Archiver/AssetsRequest.cs → ...Modules/Archivers/Region/AssetsRequest.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Archiver
namespace Aurora.Modules.Archivers
{
/// <summary>
/// Encapsulate the asynchronous requests for the assets required for an archive operation
2 .../Modules/World/Archiver/AuroraArchiver.cs → ...odules/Archivers/Region/AuroraArchiver.cs
View file
@@ -38,7 +38,7 @@
using Aurora.Framework.Serialization;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Archivers
{
public class AuroraArchiver : IService, IAuroraBackupArchiver
{
2 ...odules/World/Archiver/SerializerModule.cs → ...ules/Archivers/Region/SerializerModule.cs
View file
@@ -33,7 +33,7 @@
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Serialization;

namespace OpenSim.Region.CoreModules.World.Serialiser
namespace Aurora.Modules.Archivers
{
public class SerialiserModule : ISharedRegionModule, IRegionSerialiserModule
{
2 Aurora/Modules/Avatar/AbuseReports/AbuseReportsModule.cs
View file
@@ -40,7 +40,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.AbuseReports
{
public class AbuseReportsGUIService : IService
{
2 ...atar/AvatarFactory/AvatarFactoryModule.cs → .../Avatar/Appearance/AvatarFactoryModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Services.Interfaces;
using Timer = System.Timers.Timer;

namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
namespace Aurora.Modules.Appearance
{
public class AvatarFactoryModule : IAvatarFactory, INonSharedRegionModule
{
4 ...s/Avatar/Attachments/AttachmentsModule.cs → ...s/Avatar/Attachments/AttachmentsModule.cs
View file
@@ -36,7 +36,7 @@
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Serialization;

namespace OpenSim.Region.CoreModules.Avatar.Attachments
namespace Aurora.Modules.Attachments
{
public class AttachmentsModule : IAttachmentsModule, INonSharedRegionModule
{
@@ -94,7 +94,7 @@ public void Close()
RemoveRegion(m_scene);
}

protected void AgentIsLeaving(IScenePresence presence, Services.Interfaces.GridRegion destination)
protected void AgentIsLeaving(IScenePresence presence, OpenSim.Services.Interfaces.GridRegion destination)
{
//If its a root agent, we need to save all attachments as well
SuspendAvatar(presence);
2 Aurora/Modules/Avatar/AuroraChat/AuroraChatModule.cs
View file
@@ -42,7 +42,7 @@
using OpenSim.Services.Interfaces;
using ChatSessionMember = Aurora.Framework.ChatSessionMember;

namespace Aurora.Modules
namespace Aurora.Modules.Chat
{
public class AuroraChatModule : ISharedRegionModule, IChatModule, IMuteListModule
{
2 Aurora/Modules/Avatar/AuroraChat/AuroraDefaultChatPlugins.cs
View file
@@ -33,7 +33,7 @@
using Language = Aurora.GoogleAPIs.Language;
using Google.API.Translate;

namespace Aurora.Modules.Avatar.AuroraChat
namespace Aurora.Modules.Chat
{
/// <summary>
/// This allows you to use a calculator inworld via chat
2 Aurora/Modules/Avatar/AuroraChat/AuroraDialogModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Chat
{
/// <summary>
/// This dialog module has support for mute lists
2 Aurora/Modules/Avatar/AuroraChat/AuroraOfflineMessagesModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Services.Interfaces;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Chat
{
public class AuroraOfflineMessageModule : ISharedRegionModule
{
2 ...ar/InstantMessage/InstantMessageModule.cs → ...at/InstantMessage/InstantMessageModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
namespace Aurora.Modules.Chat
{
public class InstantMessageModule : ISharedRegionModule
{
2 ...r/InstantMessage/MessageTransferModule.cs → ...t/InstantMessage/MessageTransferModule.cs
View file
@@ -40,7 +40,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
namespace Aurora.Modules.Chat
{
public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
{
2 ...ar/InstantMessage/OfflineMessageModule.cs → ...at/InstantMessage/OfflineMessageModule.cs
View file
@@ -35,7 +35,7 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
namespace Aurora.Modules.Chat
{
public class OfflineMessageModule : ISharedRegionModule
{
2 ...s/Avatar/InstantMessage/PresenceModule.cs → ...roraChat/InstantMessage/PresenceModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
namespace Aurora.Modules.Chat
{
public class PresenceModule : ISharedRegionModule
{
2 ...ra/Modules/Avatar/GodModule/LureModule.cs → ...a/Modules/Avatar/AuroraChat/LureModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules
namespace Aurora.Modules.Chat
{
/// <summary>
/// This just supports god TP's and thats about it
2 Aurora/Modules/Avatar/AuroraCombatModule/CombatModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
namespace Aurora.Modules.Combat
{
public class AuroraCombatModule : INonSharedRegionModule, ICombatModule
{
2 Aurora/Modules/Avatar/AuroraProfile/AvatarProfileModule.cs
View file
@@ -39,7 +39,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules
namespace Aurora.Modules.Profiles
{
public class AuroraProfileModule : ISharedRegionModule
{
2 Aurora/Modules/Avatar/AuroraSearch/AuroraSearchModule.cs
View file
@@ -37,7 +37,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules
namespace Aurora.Modules.Search
{
public class AuroraSearchModule : ISharedRegionModule
{
2 Aurora/Modules/Avatar/CallingCardModule/CallingCardModule.cs
View file
@@ -34,7 +34,7 @@
using OpenMetaverse;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.CallingCards
{
public class CallingCardModule : ISharedRegionModule, ICallingCardModule
{
2 ...oreModules/Avatar/ObjectCaps/ObjectAdd.cs → Aurora/Modules/Avatar/Caps/ObjectAdd.cs
View file
@@ -37,7 +37,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
namespace Aurora.Modules.Caps
{
public class ObjectAdd : INonSharedRegionModule
{
2 ...tar/ObjectCaps/UploadObjectAssetModule.cs → ...es/Avatar/Caps/UploadObjectAssetModule.cs
View file
@@ -39,7 +39,7 @@
using OpenSim.Region.Framework.Scenes;
using ExtraParamType = OpenMetaverse.ExtraParamType;

namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
namespace Aurora.Modules.Caps
{
public class UploadObjectAssetModule : INonSharedRegionModule
{
2 ...reModules/Avatar/Friends/FriendsModule.cs → ...a/Modules/Avatar/Friends/FriendsModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Services.Interfaces;
using FriendInfo = OpenSim.Services.Interfaces.FriendInfo;

namespace OpenSim.Region.CoreModules.Avatar.Friends
namespace Aurora.Modules.Friends
{
public class FriendsModule : ISharedRegionModule, IFriendsModule
{
2 Aurora/Modules/Avatar/GenericVoiceModule/GenericVoiceModule.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Voice
{
public class GenericVoiceModule : ISharedRegionModule
{
2 ...Modules/Avatar/Gestures/GesturesModule.cs → ...Modules/Avatar/Gestures/GesturesModule.cs
View file
@@ -33,7 +33,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.Gestures
namespace Aurora.Modules.Gestures
{
public class GesturesModule : INonSharedRegionModule
{
3 Aurora/Modules/Avatar/GodModule/GodMode.cs
View file
@@ -32,10 +32,9 @@
using Nini.Config;
using Nini.Ini;
using OpenMetaverse;
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Gods
{
public class GodModifiers : ISharedRegionModule
{
2 ...ion/CoreModules/Avatar/Gods/GodsModule.cs → ...ra/Modules/Avatar/GodModule/GodsModule.cs
View file
@@ -36,7 +36,7 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.Gods
namespace Aurora.Modules.Gods
{
public class GodsModule : INonSharedRegionModule, IGodsModule
{
4 ...uroraDataGroupsServicesConnectorModule.cs → ...uroraDataGroupsServicesConnectorModule.cs
View file
@@ -37,7 +37,7 @@
using OpenSim.Services.Interfaces;
using ChatSessionMember = Aurora.Framework.ChatSessionMember;

namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
namespace Aurora.Modules.Groups
{
public class AuroraDataGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector
{
@@ -418,7 +418,7 @@ public void Close()

public void AddRegion(IScene scene)
{
GroupsConnector = DataManager.RequestPlugin<IGroupsServiceConnector>();
GroupsConnector = Aurora.DataManager.DataManager.RequestPlugin<IGroupsServiceConnector>();
if (GroupsConnector == null)
{
MainConsole.Instance.Warn("[AURORA-GROUPS-CONNECTOR]: GroupsConnector is null");
2 ...es/Avatar/Groups/GroupsMessagingModule.cs → ...es/Avatar/Groups/GroupsMessagingModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Services.Interfaces;
using ChatSessionMember = Aurora.Framework.ChatSessionMember;

namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
namespace Aurora.Modules.Groups
{
public class GroupsMessagingModule : ISharedRegionModule, IGroupsMessagingModule
{
2 ...CoreModules/Avatar/Groups/GroupsModule.cs → Aurora/Modules/Avatar/Groups/GroupsModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
namespace Aurora.Modules.Groups
{
public class GroupsModule : ISharedRegionModule, IGroupsModule
{
2 ...ps/SimianGroupsServicesConnectorModule.cs → ...ps/SimianGroupsServicesConnectorModule.cs
View file
@@ -92,7 +92,7 @@
*
* */

namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
namespace Aurora.Modules.Groups
{
public class SimianGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector
{
2 ...ps/XmlRpcGroupsServicesConnectorModule.cs → ...ps/XmlRpcGroupsServicesConnectorModule.cs
View file
@@ -40,7 +40,7 @@
using OpenSim.Services.Interfaces;
using ChatSessionMember = Aurora.Framework.ChatSessionMember;

namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
namespace Aurora.Modules.Groups
{
public class XmlRpcGroupsServicesConnectorModule : ISharedRegionModule, IGroupsServicesConnector
{
2 ...ntory/Transfer/InventoryTransferModule.cs → ...atar/Inventory/InventoryTransferModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
namespace Aurora.Modules.Inventory
{
public class InventoryTransferModule : ISharedRegionModule
{
2 ...atar/ClientInventory/LLClientInventory.cs → ...les/Avatar/Inventory/LLClientInventory.cs
View file
@@ -39,7 +39,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.Framework.Scenes
namespace Aurora.Modules.Inventory
{
public class LLClientInventory : INonSharedRegionModule, ILLClientInventory
{
2 Aurora/Modules/Avatar/ObjectCache/ObjectCacheModule.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.ObjectCache
{
public class ObjectCacheModule : INonSharedRegionModule, IObjectCache
{
2 Aurora/Modules/Avatar/SelectionModule/SelectionModule.cs
View file
@@ -35,7 +35,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Selection
{
public class SelectionModule : ISharedRegionModule
{
3 ...ng/DynamicTexture/DynamicTextureModule.cs → ...ng/DynamicTexture/DynamicTextureModule.cs
View file
@@ -34,10 +34,9 @@
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.Imaging;
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
namespace Aurora.Modules.Scripting
{
public class DynamicTextureModule : ISharedRegionModule, IDynamicTextureManager
{
3 ...les/Scripting/EMailModules/EmailModule.cs → ...les/Scripting/EmailModules/EmailModule.cs
View file
@@ -36,10 +36,9 @@
using DotNetOpenMail.SmtpAuth;
using Nini.Config;
using OpenMetaverse;
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Scripting.EmailModules
namespace Aurora.Modules.Scripting
{
public class EmailModule : ISharedRegionModule, IEmailModule
{
2 ...ipting/HttpRequest/ScriptsHttpRequests.cs → ...ipting/HttpRequest/ScriptsHttpRequests.cs
View file
@@ -80,7 +80,7 @@
*
* **************************************************/

namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
namespace Aurora.Modules.Scripting
{
public class HttpRequestModule : INonSharedRegionModule, IHttpRequestModule
{
2 ...oreModules/Scripting/LSLHttp/UrlModule.cs → ...ra/Modules/Scripting/LSLHttp/UrlModule.cs
View file
@@ -35,7 +35,7 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
namespace Aurora.Modules.Scripting
{
public class UrlData
{
2 ...ipting/LoadImageURL/LoadImageURLModule.cs → ...ipting/LoadImageURL/LoadImageURLModule.cs
View file
@@ -36,7 +36,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
namespace Aurora.Modules.Scripting
{
public class LoadImageURLModule : ISharedRegionModule, IDynamicTextureRender
{
2 ...r/AvatarModules/ScriptControllerModule.cs → ...criptController/ScriptControllerModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules.Avatar.AvatarModules
namespace Aurora.Modules.Scripting
{
public class ScriptControllerModule : ISharedRegionModule
{
2 ...ipting/VectorRender/VectorRenderModule.cs → ...ipting/VectorRender/VectorRenderModule.cs
View file
@@ -41,7 +41,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Scripting.VectorRender
namespace Aurora.Modules.Scripting
{
public class VectorRenderModule : ISharedRegionModule, IDynamicTextureRender
{
2 ...es/Scripting/WorldComm/WorldCommModule.cs → ...es/Scripting/WorldComm/WorldCommModule.cs
View file
@@ -83,7 +83,7 @@
*
* **************************************************/

namespace OpenSim.Region.CoreModules.Scripting.WorldComm
namespace Aurora.Modules.Scripting
{
public class WorldCommModule : INonSharedRegionModule, IWorldComm
{
20 ...eModules/Scripting/XMLRPC/XMLRPCModule.cs → .../Modules/Scripting/XMLRPC/XMLRPCModule.cs
View file
@@ -72,7 +72,7 @@
*
* **************************************************/

namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
namespace Aurora.Modules.Scripting
{
public class XMLRPCModule : ISharedRegionModule, IXMLRPC
{
@@ -660,16 +660,16 @@ public UUID GetPrimID()
}
}

public class SendRemoteDataRequest : IServiceRequest
public class SendRemoteDataRequest : ISendRemoteDataRequest
{
public string Channel;
public string DestURL;
public int Idata;

public XmlRpcRequest Request;
public int ResponseIdata;
public string ResponseSdata;
public string Sdata;
public string Channel { get; set; }
public string DestURL { get; set; }
public int Idata { get; set; }

public XmlRpcRequest Request { get; set; }
public int ResponseIdata { get; set; }
public string ResponseSdata { get; set; }
public string Sdata { get; set; }
private bool _finished;
private Thread httpThread;

2 ...ld/ActivitiyDetectors/ActivityDetector.cs → ...ld/ActivitiyDetectors/ActivityDetector.cs
View file
@@ -36,7 +36,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.ActivityDetectors
{
public class ActivityDetector : ISharedRegionModule
{
2 Aurora/Modules/World/Assets/BlackholeRegionCommands.cs
View file
@@ -8,7 +8,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules.World.Assets
namespace Aurora.Modules.Assets
{
public class BlackholeRegionCommands : ISharedRegionModule
{
3 Aurora/Modules/World/Auction/AuctionModule.cs
View file
@@ -34,9 +34,8 @@
using Aurora.Framework.Capabilities;
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using Aurora.Framework;

namespace Aurora.Modules
namespace Aurora.Modules.Auction
{
public class AuctionModule : IAuctionModule, INonSharedRegionModule
{
2 Aurora/Modules/World/BannedViewersModule/BanCheck.cs
View file
@@ -39,7 +39,7 @@
using OpenMetaverse;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Ban
{
#region Grid BanCheck

2 Aurora/Modules/World/BannedViewersModule/GridWideViewerBan.cs
View file
@@ -36,7 +36,7 @@
using OpenMetaverse.StructuredData;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Ban
{
public class GridWideViewerBan : IService
{
2 Aurora/Modules/World/BannedViewersModule/LocalPresenceInfoConnector.cs
View file
@@ -33,7 +33,7 @@
using Aurora.DataManager;
using Aurora.Framework;

namespace Aurora.Modules
namespace Aurora.Modules.Ban
{
public class LocalPresenceInfoConnector : IPresenceInfo, IAuroraDataPlugin
{
2 Aurora/Modules/World/BannedViewersModule/PresenceInfo.cs
View file
@@ -30,7 +30,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace Aurora.Modules
namespace Aurora.Modules.Ban
{
public class PresenceInfo
{
3 Aurora/Modules/World/BannedViewersModule/PresenceInfoMigrator_2.cs
View file
@@ -28,8 +28,9 @@
using System.Collections.Generic;
using C5;
using Aurora.Framework;
using Aurora.DataManager.Migration;

namespace Aurora.DataManager.Migration.Migrators
namespace Aurora.Modules.Ban
{
public class PresenceInfoMigrator_2 : Migrator
{
2 ...on/CoreModules/World/Cloud/CloudModule.cs → Aurora/Modules/World/Cloud/CloudModule.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Cloud
{
public class CloudModule : ICloudModule
{
2 Aurora/Modules/World/CrossRegionBanSystem/CrossRegionBanSystem.cs
View file
@@ -39,7 +39,7 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.CrossRegionBanSystem
{
public class CrossRegionBanSystem : ISharedRegionModule
{
4 Aurora/Modules/World/DefaultInventoryIARLoader/DefaultInventoryIARLoader.cs
View file
@@ -33,11 +33,11 @@
using Nini.Config;
using OpenMetaverse;
using Aurora.Framework;
using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
using Aurora.Modules.Archivers;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules.World.DefaultInventoryIARLoader
namespace Aurora.Modules.DefaultInventoryIARLoader
{
public class DefaultInventoryIARLoader : IDefaultLibraryLoader
{
2 ...es/World/Objects/BuySell/BuySellModule.cs → ...s/World/Entities/BuySell/BuySellModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Serialization;

namespace OpenSim.Region.CoreModules.World.Objects.BuySell
namespace Aurora.Modules.Entities.BuySell
{
public class BuySellModule : IBuySellModule, INonSharedRegionModule
{
2 ...dules/World/Entities/EntityCountModule.cs → ...Entities/EntityCount/EntityCountModule.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Scenes;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules
namespace Aurora.Modules.Entities.EntityCount
{
public class EntityCountModule : INonSharedRegionModule, IEntityCountModule
{
2 ...oreModules/World/Media/Moap/MoapModule.cs → ...odules/World/Entities/Media/MoapModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.Media.Moap
namespace Aurora.Modules.Entities.Media
{
public class MoapModule : INonSharedRegionModule, IMoapModule
{
2 ...ectDelete/AsyncSceneObjectGroupDeleter.cs → ...ectDelete/AsyncSceneObjectGroupDeleter.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Entities.ObjectDelete
{
public class DeleteToInventoryHolder
{
2 ...hysicsMaterials/PhysicsMaterialsModule.cs → ...hysicsMaterials/PhysicsMaterialsModule.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.Entities.PhysicsMaterials
{
public class PhysicsMaterialsModule : INonSharedRegionModule
{
2 ...rk/EntityTransfer/EntityTransferModule.cs → ...ld/EntityTransfer/EntityTransferModule.cs
View file
@@ -41,7 +41,7 @@
using OpenMetaverse.StructuredData;
using Nini.Config;

namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
namespace Aurora.Modules.EntityTransfer
{
public class EntityTransferModule : ISharedRegionModule, IEntityTransferModule
{
16 ...odules/World/Startup/EstateInitializer.cs → ...Modules/World/Estate/EstateInitializer.cs
View file
@@ -39,7 +39,7 @@
using Aurora.Simulation.Base;
using OpenMetaverse.StructuredData;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Estate
{
public class EstateInitializer : ISharedRegionStartupModule, IAuroraBackupModule
{
@@ -56,7 +56,7 @@ private EstateSettings CreateEstateInfo(IScene scene)
EstateSettings ES = new EstateSettings();
while (true)
{
IEstateConnector EstateConnector = DataManager.RequestPlugin<IEstateConnector>();
IEstateConnector EstateConnector = Aurora.DataManager.DataManager.RequestPlugin<IEstateConnector>();

string name = MainConsole.Instance.Prompt("Estate owner name", LastEstateOwner);
UserAccount account = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, name);
@@ -128,7 +128,7 @@ private EstateSettings CreateEstateInfo(IScene scene)
continue;
}
//We set this back if there wasn't an error because the EstateService will NOT send it back
IGenericsConnector g = DataManager.RequestPlugin<IGenericsConnector>();
IGenericsConnector g = Aurora.DataManager.DataManager.RequestPlugin<IGenericsConnector>();
EstatePassword s = new EstatePassword { Password = Password };
if (g != null) //Save the pass to the database
{
@@ -185,7 +185,7 @@ private EstateSettings CreateEstateInfo(IScene scene)
continue;
}
//Reset the pass and save it to the database
IGenericsConnector g = DataManager.RequestPlugin<IGenericsConnector>();
IGenericsConnector g = Aurora.DataManager.DataManager.RequestPlugin<IGenericsConnector>();
EstatePassword s = new EstatePassword { Password = Password };
if (g != null) //Save the pass to the database
{
@@ -217,7 +217,7 @@ public void FinishStartup(IScene scene, IConfigSource source, ISimulationBase op
if (scene.RegionInfo.EstateSettings != null)
return;

IEstateConnector EstateConnector = DataManager.RequestPlugin<IEstateConnector>();
IEstateConnector EstateConnector = Aurora.DataManager.DataManager.RequestPlugin<IEstateConnector>();
if (EstateConnector != null)
{
EstateSettings ES;
@@ -248,7 +248,7 @@ public void FinishStartup(IScene scene, IConfigSource source, ISimulationBase op
}
}
//Get the password from the database now that we have either created a new estate and saved it, joined a new estate, or just reloaded
IGenericsConnector g = DataManager.RequestPlugin<IGenericsConnector>();
IGenericsConnector g = Aurora.DataManager.DataManager.RequestPlugin<IGenericsConnector>();
EstatePassword s = null;
if (g != null)
s = g.GetGeneric(scene.RegionInfo.RegionID, "EstatePassword", ES.EstateID.ToString(), new EstatePassword());
@@ -276,7 +276,7 @@ public void Close(IScene scene)

protected void ChangeEstate(string[] cmd)
{
IEstateConnector EstateConnector = DataManager.RequestPlugin<IEstateConnector>();
IEstateConnector EstateConnector = Aurora.DataManager.DataManager.RequestPlugin<IEstateConnector>();
if (EstateConnector != null)
{
if (MainConsole.Instance.ConsoleScene == null)
@@ -294,7 +294,7 @@ protected void ChangeEstate(string[] cmd)
return;
}
scene.RegionInfo.EstateSettings = CreateEstateInfo(scene);
IGenericsConnector g = DataManager.RequestPlugin<IGenericsConnector>();
IGenericsConnector g = Aurora.DataManager.DataManager.RequestPlugin<IGenericsConnector>();
EstatePassword s = null;
if (g != null)
s = g.GetGeneric(scene.RegionInfo.RegionID, "EstatePassword", scene.RegionInfo.EstateSettings.EstateID.ToString(), new EstatePassword());
5 ...es/World/Estate/EstateManagementModule.cs → ...es/World/Estate/EstateManagementModule.cs
View file
@@ -39,9 +39,10 @@
using OpenSim.Region.Framework.Interfaces;
using Aurora.Framework.Servers.HttpServer;
using OpenMetaverse.StructuredData;
using OpenSim.Services.Interfaces;
using RegionFlags = OpenMetaverse.RegionFlags;

namespace OpenSim.Region.CoreModules.World.Estate
namespace Aurora.Modules.Estate
{
public class EstateManagementModule : IEstateModule
{
@@ -1112,7 +1113,7 @@ private void HandleLandStatRequest(int parcelID, uint reportType, uint requestFl
TaskName = prt.Name,
TimeModified = sog.RootChild.Rezzed
};
Services.Interfaces.UserAccount account =
UserAccount account =
m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, sog.OwnerID);
lsri.OwnerName = account != null ? account.Name : "Unknown";

2 Aurora/Modules/World/Estate/EstateService.cs
View file
@@ -39,7 +39,7 @@
using OpenSim.Services.Interfaces;
using RegionFlags = Aurora.Framework.RegionFlags;

namespace Aurora.Modules
namespace Aurora.Modules.Estate
{
public class EstateSettingsModule : ISharedRegionStartupModule
{
2 .../World/Estate/EstateTerrainXferHandler.cs → .../World/Estate/EstateTerrainXferHandler.cs
View file
@@ -29,7 +29,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Estate
namespace Aurora.Modules.Estate
{
public class EstateTerrainXferHandler
{
2 .../InventoryAccess/InventoryAccessModule.cs → .../InventoryAccess/InventoryAccessModule.cs
View file
@@ -39,7 +39,7 @@
using OpenMetaverse;
using Nini.Config;

namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
namespace Aurora.Module.InventoryAccess
{
public class BasicInventoryAccessModule : INonSharedRegionModule, IInventoryAccessModule
{
2 ...gion/CoreModules/World/Land/LandObject.cs → Aurora/Modules/World/Land/LandObject.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Land
namespace Aurora.Modules.Land
{
/// <summary>
/// Keeps track of a specific piece of land's information
10 ...ules/World/Land/ParcelManagementModule.cs → ...ules/World/Land/ParcelManagementModule.cs
View file
@@ -44,7 +44,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace OpenSim.Region.CoreModules.World.Land
namespace Aurora.Modules.Land
{
public class ParcelManagementModule : INonSharedRegionModule, IParcelManagementModule
{
@@ -592,7 +592,7 @@ public ILandObject GetLandObject(int x, int y)

protected void AddLandObjectToSearch(ILandObject parcel)
{
IDirectoryServiceConnector DSC = DataManager.RequestPlugin<IDirectoryServiceConnector>();
IDirectoryServiceConnector DSC = Aurora.DataManager.DataManager.RequestPlugin<IDirectoryServiceConnector>();
if (DSC != null)
{
if (m_UpdateDirectoryOnUpdate)
@@ -605,7 +605,7 @@ protected void AddLandObjectToSearch(ILandObject parcel)

private void RemoveLandObjectFromSearch(ILandObject iLandObject)
{
IDirectoryServiceConnector DSC = DataManager.RequestPlugin<IDirectoryServiceConnector>();
IDirectoryServiceConnector DSC = Aurora.DataManager.DataManager.RequestPlugin<IDirectoryServiceConnector>();
if (DSC != null)
{
if (m_UpdateDirectoryOnUpdate)
@@ -2170,7 +2170,7 @@ private void UpdateDirectoryTimerElapsed(object sender, ElapsedEventArgs e)

private void DoSearchUpdate()
{
IDirectoryServiceConnector DSC = DataManager.RequestPlugin<IDirectoryServiceConnector>();
IDirectoryServiceConnector DSC = Aurora.DataManager.DataManager.RequestPlugin<IDirectoryServiceConnector>();
if (DSC != null)
DSC.AddRegion(AllParcels().ConvertAll(delegate(ILandObject o)
{
@@ -2310,7 +2310,7 @@ private void ClientOnParcelInfoRequest(IClientAPI remoteClient, UUID parcelID)
out X, out Y, out Z);
MainConsole.Instance.DebugFormat("[LAND] got parcelinfo request for regionHandle {0}, x/y {1}/{2}",
RegionHandle, X, Y);
IDirectoryServiceConnector DSC = DataManager.RequestPlugin<IDirectoryServiceConnector>();
IDirectoryServiceConnector DSC = Aurora.DataManager.DataManager.RequestPlugin<IDirectoryServiceConnector>();
if (DSC != null)
{
LandData data = DSC.GetParcelInfo(parcelID);
2 ...dules/World/Land/ParcelPrimCountModule.cs → ...dules/World/Land/ParcelPrimCountModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Land
namespace Aurora.Modules.Land
{
public class ParcelCounts
{
0 ...mework/Monitoring/Alerts/DeadlockAlert.cs → .../World/Monitoring/Alerts/DeadlockAlert.cs
View file
File renamed without changes.
2 .../Framework/Logging/BinaryLoggingModule.cs → ...s/World/Monitoring/BinaryLoggingModule.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.Avatar.Attachments
namespace Aurora.Modules.Monitoring
{
public class BinaryLoggingModule : INonSharedRegionModule
{
2 ...les/Framework/Monitoring/MonitorModule.cs → ...Modules/World/Monitoring/MonitorModule.cs
View file
@@ -44,7 +44,7 @@
using ThreadState = System.Diagnostics.ThreadState;
using Timer = System.Timers.Timer;

namespace OpenSim.Region.CoreModules.Framework.Monitoring
namespace Aurora.Modules.Monitoring
{
public class MonitorModule : IApplicationPlugin, IMonitorModule
{
0 .../Monitoring/Monitors/AgentCountMonitor.cs → .../Monitoring/Monitors/AgentCountMonitor.cs
View file
File renamed without changes.
0 ...Monitoring/Monitors/AgentUpdateMonitor.cs → ...Monitoring/Monitors/AgentUpdateMonitor.cs
View file
File renamed without changes.
0 ...ework/Monitoring/Monitors/AssetMonitor.cs → ...World/Monitoring/Monitors/AssetMonitor.cs
View file
File renamed without changes.
0 ...toring/Monitors/ChildAgentCountMonitor.cs → ...toring/Monitors/ChildAgentCountMonitor.cs
View file
File renamed without changes.
0 ...rk/Monitoring/Monitors/GCMemoryMonitor.cs → ...ld/Monitoring/Monitors/GCMemoryMonitor.cs
View file
File renamed without changes.
0 ...itoring/Monitors/ImageFrameTimeMonitor.cs → ...itoring/Monitors/ImageFrameTimeMonitor.cs
View file
File renamed without changes.
0 ...nitoring/Monitors/LastFrameTimeMonitor.cs → ...nitoring/Monitors/LastFrameTimeMonitor.cs
View file
File renamed without changes.
0 ...ework/Monitoring/Monitors/LoginMonitor.cs → ...World/Monitoring/Monitors/LoginMonitor.cs
View file
File renamed without changes.
0 ...ork/Monitoring/Monitors/NetworkMonitor.cs → ...rld/Monitoring/Monitors/NetworkMonitor.cs
View file
File renamed without changes.
0 ...Monitoring/Monitors/ObjectCountMonitor.cs → ...Monitoring/Monitors/ObjectCountMonitor.cs
View file
File renamed without changes.
0 ...onitoring/Monitors/ObjectUpdateMonitor.cs → ...onitoring/Monitors/ObjectUpdateMonitor.cs
View file
File renamed without changes.
0 .../Monitoring/Monitors/OtherFrameMonitor.cs → .../Monitoring/Monitors/OtherFrameMonitor.cs
View file
File renamed without changes.
0 ...k/Monitoring/Monitors/PWSMemoryMonitor.cs → ...d/Monitoring/Monitors/PWSMemoryMonitor.cs
View file
File renamed without changes.
0 ...onitoring/Monitors/PhysicsFrameMonitor.cs → ...onitoring/Monitors/PhysicsFrameMonitor.cs
View file
File renamed without changes.
0 ...oring/Monitors/PhysicsSyncFrameMonitor.cs → ...oring/Monitors/PhysicsSyncFrameMonitor.cs
View file
File renamed without changes.
0 ...ing/Monitors/PhysicsUpdateFrameMonitor.cs → ...ing/Monitors/PhysicsUpdateFrameMonitor.cs
View file
File renamed without changes.
0 ...Monitoring/Monitors/ScriptCountMonitor.cs → ...Monitoring/Monitors/ScriptCountMonitor.cs
View file
File renamed without changes.
0 ...toring/Monitors/ScriptFrameTimeMonitor.cs → ...toring/Monitors/ScriptFrameTimeMonitor.cs
View file
File renamed without changes.
0 ...rk/Monitoring/Monitors/SimFrameMonitor.cs → ...ld/Monitoring/Monitors/SimFrameMonitor.cs
View file
File renamed without changes.
0 .../Monitoring/Monitors/SleepFrameMonitor.cs → .../Monitoring/Monitors/SleepFrameMonitor.cs
View file
File renamed without changes.
0 ...Monitoring/Monitors/ThreadCountMonitor.cs → ...Monitoring/Monitors/ThreadCountMonitor.cs
View file
File renamed without changes.
0 ...onitoring/Monitors/TimeDilationMonitor.cs → ...onitoring/Monitors/TimeDilationMonitor.cs
View file
File renamed without changes.
0 .../Monitoring/Monitors/TotalFrameMonitor.cs → .../Monitoring/Monitors/TotalFrameMonitor.cs
View file
File renamed without changes.
2 Aurora/Modules/World/On-Demand/OnDemandRegion.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules.World.On_Demand
namespace Aurora.Modules.OnDemand
{
/// <summary>
/// Some notes on this module, this module just modifies when/where the startup code is executed
2 Aurora/Modules/World/OpenRegionSettingsModule/OpenRegionSettingsConnector.cs
View file
@@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Web;

namespace Aurora.Modules
namespace Aurora.Modules.OpenRegionSettingsModule
{
public class OpenRegionSettingsConnector : IOpenRegionSettingsConnector
{
3 Aurora/Modules/World/OpenRegionSettingsModule/OpenRegionSettingsModule.cs
View file
@@ -32,13 +32,12 @@
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using Aurora.Framework;
using Aurora.Framework.Capabilities;
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.OpenRegionSettingsModule
{
public class OpenRegionSettingsModule : INonSharedRegionModule, IOpenRegionSettingsModule
{
2 ...es/World/Permissions/PermissionsModule.cs → ...es/World/Permissions/PermissionsModule.cs
View file
@@ -36,7 +36,7 @@
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Permissions
namespace Aurora.Modules.Permissions
{
public class PermissionsModule : INonSharedRegionModule, IPermissionsModule
{
2 Aurora/Modules/World/PhysicsState/PhysicsStateModule.cs
View file
@@ -7,7 +7,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.PhysicsState
{
public class PhysicsStateModule : INonSharedRegionModule, IPhysicsStateModule
{
2 ...oreModules/World/Restart/RestartModule.cs → ...ra/Modules/World/Restart/RestartModule.cs
View file
@@ -35,7 +35,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Region
namespace Aurora.Modules.Restart
{
public class RestartModule : INonSharedRegionModule, IRestartModule
{
2 Aurora/Modules/World/SampleCurrencyModule/SampleCurrencyModule.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.OptionalModules
namespace Aurora.Modules.SampleCurrencyModule
{
/// <summary>
/// This is a demo for you to use when making one that works for you.
2 Aurora/Modules/World/SetHome/SetHomeModule.cs
View file
@@ -41,7 +41,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules.World.Auction
namespace Aurora.Modules.SetHome
{
public class SetHomeModule : INonSharedRegionModule
{
2 Aurora/Modules/World/Sim Protection/PhysicsMonitor.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Region.Framework.Interfaces;
using Timer = System.Timers.Timer;

namespace Aurora.Modules
namespace Aurora.Modules.SimProtection
{
public class PhysicsMonitor : ISharedRegionModule, IPhysicsMonitor
{
1 Aurora/Modules/World/Sim Protection/PhysicsProfilerForm.cs
View file
@@ -34,6 +34,7 @@
using Nini.Config;
using OpenMetaverse;
using Timer = System.Timers.Timer;
using Aurora.Modules.SimProtection;

namespace Aurora.Modules
{
2 Aurora/Modules/World/Sim Protection/SimProtection.cs
View file
@@ -32,7 +32,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.SimProtection
{
/// <summary>
/// This module helps keep the sim running when it begins to slow down, or if it freezes, restarts it
13 Aurora/Modules/World/SimConsole/SimConsole.cs
View file
@@ -37,10 +37,9 @@
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;
using log4net.Core;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules.World.SimConsole
namespace Aurora.Modules.SimConsole
{
/// <summary>
/// This module allows for the console to be accessed in V2 viewers that support SimConsole
@@ -53,7 +52,7 @@ public class SimConsole : ISharedRegionModule
private readonly Dictionary<UUID, Access> m_authorizedParticipants = new Dictionary<UUID, Access>();
private readonly List<IScene> m_scenes = new List<IScene>();
private readonly Dictionary<string, Access> m_userKeys = new Dictionary<string, Access>();
private readonly Dictionary<UUID, Level> m_userLogLevel = new Dictionary<UUID, Level>();
private readonly Dictionary<UUID, string> m_userLogLevel = new Dictionary<UUID, string>();
private bool m_enabled;

#region Enums
@@ -227,7 +226,7 @@ private bool AuthenticateUser(IScenePresence sp, string message)
bool firstLogin = false;
if (!m_userLogLevel.ContainsKey(sp.UUID))
{
m_userLogLevel.Add(sp.UUID, Level.Info);
m_userLogLevel.Add(sp.UUID, "Info");
firstLogin = true;
}
return ParseMessage(sp, message, firstLogin);
@@ -263,7 +262,7 @@ private bool ParseMessage(IScenePresence sp, string message, bool firstLogin)
string[] words = message.Split(' ');
if (words.Length == 4)
{
m_userLogLevel[sp.UUID] = (Level) Enum.Parse(typeof (Level), words[3]);
m_userLogLevel[sp.UUID] = words[3];
SendConsoleEventEQM(sp.UUID, "Set log level successful.");
}
else
@@ -294,7 +293,7 @@ private void EventManager_OnMakeChildAgent(IScenePresence presence, GridRegion d
m_userLogLevel.Remove(presence.UUID);
}

public void IncomingLogWrite(Level level, string text)
public void IncomingLogWrite(string level, string text)
{
if (text == "")
return;
@@ -303,7 +302,7 @@ public void IncomingLogWrite(Level level, string text)
{
if (kvp.Value == Access.ReadWrite || kvp.Value == Access.Read)
{
if (m_userLogLevel.ContainsKey(kvp.Key) && m_userLogLevel[kvp.Key] <= level)
if (m_userLogLevel.ContainsKey(kvp.Key) && MainConsole.Instance.CompareLogLevels(m_userLogLevel[kvp.Key], level))
{
//Send the EQM with the message to all people who have read access
SendConsoleEventEQM(kvp.Key, text);
2 ...on/CoreModules/World/Sound/SoundModule.cs → Aurora/Modules/World/Sound/SoundModule.cs
View file
@@ -32,7 +32,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Sound
namespace Aurora.Modules.Sound
{
public class SoundModule : INonSharedRegionModule, ISoundModule
{
2 Aurora/Modules/World/Startup/Backup.cs
View file
@@ -40,7 +40,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace Aurora.Modules
namespace Aurora.Modules.Startup
{
public class Backup : ISharedRegionStartupModule
{
3 Aurora/Modules/World/Startup/PhysicsInitializer.cs
View file
@@ -29,9 +29,8 @@
using Nini.Config;
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;
using Aurora.Framework.Physics;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Startup
{
public class PhysicsInitializer : ISharedRegionStartupModule
{
3 Aurora/Modules/World/Startup/PhysicsPluginManager.cs
View file
@@ -29,9 +29,10 @@
using System.Collections.Generic;
using System.Reflection;
using Aurora.Framework;
using Aurora.Framework.Physics;
using Nini.Config;

namespace Aurora.Framework.Physics
namespace Aurora.Modules.Startup
{
/// <summary>
/// Description of MyClass.
2 Aurora/Modules/World/Startup/RegisterRegionWithGrid.cs
View file
@@ -38,7 +38,7 @@
using OpenSim.Services.Interfaces;
using GridRegion = OpenSim.Services.Interfaces.GridRegion;

namespace Aurora.Modules
namespace Aurora.Modules.Startup
{
public class RegisterRegionWithGridModule : ISharedRegionStartupModule, IGridRegisterModule
{
2 Aurora/Modules/World/Startup/SimulationData/FileBasedSimulationData.cs
View file
@@ -44,7 +44,7 @@
using OpenSim.Region.Framework.Scenes.Serialization;
using Timer = System.Timers.Timer;

namespace Aurora.Modules.FileBasedSimulationData
namespace Aurora.Modules.Startup.FileBasedSimulationData
{
/// <summary>
/// FileBased DataStore, do not store anything in any databases, instead save .abackup files for it
2 ...Region/CoreModules/World/Sun/SunModule.cs → Aurora/Modules/World/Sun/SunModule.cs
View file
@@ -34,7 +34,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Sun
{
public class SunModule : ISunModule
{
2 ...eModules/World/Terrain/FileLoaders/BMP.cs → .../Modules/World/Terrain/FileLoaders/BMP.cs
View file
@@ -30,7 +30,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
///<summary>
/// A generic windows bitmap loader.
2 ...eModules/World/Terrain/FileLoaders/GIF.cs → .../Modules/World/Terrain/FileLoaders/GIF.cs
View file
@@ -30,7 +30,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
internal class GIF : GenericSystemDrawing
{
2 ...rrain/FileLoaders/GenericSystemDrawing.cs → ...rrain/FileLoaders/GenericSystemDrawing.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
/// <summary>
/// A virtual class designed to have methods overloaded,
2 ...Modules/World/Terrain/FileLoaders/JPEG.cs → ...Modules/World/Terrain/FileLoaders/JPEG.cs
View file
@@ -31,7 +31,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
public class JPEG : ITerrainLoader
{
2 ...odules/World/Terrain/FileLoaders/LLRAW.cs → ...odules/World/Terrain/FileLoaders/LLRAW.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
public class LLRAW : ITerrainLoader
{
2 ...eModules/World/Terrain/FileLoaders/PNG.cs → .../Modules/World/Terrain/FileLoaders/PNG.cs
View file
@@ -30,7 +30,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
internal class PNG : GenericSystemDrawing
{
2 ...odules/World/Terrain/FileLoaders/RAW32.cs → ...odules/World/Terrain/FileLoaders/RAW32.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
public class RAW32 : ITerrainLoader
{
2 ...Modules/World/Terrain/FileLoaders/TIFF.cs → ...Modules/World/Terrain/FileLoaders/TIFF.cs
View file
@@ -30,7 +30,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
internal class TIFF : GenericSystemDrawing
{
2 ...les/World/Terrain/FileLoaders/Terragen.cs → ...les/World/Terrain/FileLoaders/Terragen.cs
View file
@@ -31,7 +31,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
namespace Aurora.Modules.Terrain.FileLoaders
{
/// <summary>
/// Terragen File Format Loader
2 ...World/Terrain/FloodBrushes/FlattenArea.cs → ...World/Terrain/FloodBrushes/FlattenArea.cs
View file
@@ -28,7 +28,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class FlattenArea : ITerrainFloodEffect
{
2 ...s/World/Terrain/FloodBrushes/LowerArea.cs → ...s/World/Terrain/FloodBrushes/LowerArea.cs
View file
@@ -28,7 +28,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class LowerArea : ITerrainFloodEffect
{
2 ...s/World/Terrain/FloodBrushes/NoiseArea.cs → ...s/World/Terrain/FloodBrushes/NoiseArea.cs
View file
@@ -29,7 +29,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class NoiseArea : ITerrainFloodEffect
{
2 ...s/World/Terrain/FloodBrushes/RaiseArea.cs → ...s/World/Terrain/FloodBrushes/RaiseArea.cs
View file
@@ -28,7 +28,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class RaiseArea : ITerrainFloodEffect
{
2 .../World/Terrain/FloodBrushes/RevertArea.cs → .../World/Terrain/FloodBrushes/RevertArea.cs
View file
@@ -29,7 +29,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class RevertArea : ITerrainFloodEffect
{
2 .../World/Terrain/FloodBrushes/SmoothArea.cs → .../World/Terrain/FloodBrushes/SmoothArea.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.FloodBrushes
namespace Aurora.Modules.Terrain.FloodBrushes
{
public class SmoothArea : ITerrainFloodEffect
{
2 ...ules/World/Terrain/ITerrainFloodEffect.cs → ...ules/World/Terrain/ITerrainFloodEffect.cs
View file
@@ -28,7 +28,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain
namespace Aurora.Modules.Terrain
{
public interface ITerrainFloodEffect
{
2 ...reModules/World/Terrain/ITerrainLoader.cs → ...a/Modules/World/Terrain/ITerrainLoader.cs
View file
@@ -28,7 +28,7 @@
using System.IO;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain
namespace Aurora.Modules.Terrain
{
public interface ITerrainLoader
{
2 .../World/Terrain/ITerrainPaintableEffect.cs → .../World/Terrain/ITerrainPaintableEffect.cs
View file
@@ -29,7 +29,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain
namespace Aurora.Modules.Terrain
{
public interface ITerrainPaintableEffect
{
2 ...World/Terrain/PaintBrushes/ErodeSphere.cs → ...World/Terrain/PaintBrushes/ErodeSphere.cs
View file
@@ -31,7 +31,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
/// <summary>
/// Hydraulic Erosion Brush
2 ...rld/Terrain/PaintBrushes/FlattenSphere.cs → ...rld/Terrain/PaintBrushes/FlattenSphere.cs
View file
@@ -31,7 +31,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class FlattenSphere : ITerrainPaintableEffect
{
2 ...World/Terrain/PaintBrushes/LowerSphere.cs → ...World/Terrain/PaintBrushes/LowerSphere.cs
View file
@@ -30,7 +30,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class LowerSphere : ITerrainPaintableEffect
{
2 ...World/Terrain/PaintBrushes/NoiseSphere.cs → ...World/Terrain/PaintBrushes/NoiseSphere.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class NoiseSphere : ITerrainPaintableEffect
{
2 ...World/Terrain/PaintBrushes/OlsenSphere.cs → ...World/Terrain/PaintBrushes/OlsenSphere.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
///<summary>
/// Speed-Optimised Hybrid Erosion Brush
2 ...World/Terrain/PaintBrushes/PaintSphere.cs → ...World/Terrain/PaintBrushes/PaintSphere.cs
View file
@@ -34,7 +34,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class PaintSphere : ITerrainPaintableEffect
{
2 ...World/Terrain/PaintBrushes/RaiseSphere.cs → ...World/Terrain/PaintBrushes/RaiseSphere.cs
View file
@@ -30,7 +30,7 @@
using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class RaiseSphere : ITerrainPaintableEffect
{
2 ...orld/Terrain/PaintBrushes/RevertSphere.cs → ...orld/Terrain/PaintBrushes/RevertSphere.cs
View file
@@ -31,7 +31,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class RevertSphere : ITerrainPaintableEffect
{
2 ...orld/Terrain/PaintBrushes/SmoothSphere.cs → ...orld/Terrain/PaintBrushes/SmoothSphere.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
public class SmoothSphere : ITerrainPaintableEffect
{
2 ...rld/Terrain/PaintBrushes/WeatherSphere.cs → ...rld/Terrain/PaintBrushes/WeatherSphere.cs
View file
@@ -30,7 +30,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain.PaintBrushes
namespace Aurora.Modules.Terrain.PaintBrushes
{
/// <summary>
/// Thermal Weathering Paint Brush
2 ...Modules/World/Terrain/TerrainException.cs → ...Modules/World/Terrain/TerrainException.cs
View file
@@ -27,7 +27,7 @@

using System;

namespace OpenSim.Region.CoreModules.World.Terrain
namespace Aurora.Modules.Terrain
{
public class TerrainException : Exception
{
8 ...oreModules/World/Terrain/TerrainModule.cs → ...ra/Modules/World/Terrain/TerrainModule.cs
View file
@@ -35,13 +35,13 @@
using Aurora.Framework;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Region.CoreModules.World.Terrain.FileLoaders;
using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes;
using Aurora.Modules.Terrain.FileLoaders;
using Aurora.Modules.Terrain.FloodBrushes;
using Aurora.Modules.Terrain.PaintBrushes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.Terrain
namespace Aurora.Modules.Terrain
{
public class TerrainModule : INonSharedRegionModule, ITerrainModule
{
2 ...ules/World/Vegetation/VegetationModule.cs → ...ules/World/Vegetation/VegetationModule.cs
View file
@@ -33,7 +33,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.Avatar.Vegetation
namespace Aurora.Modules.Vegetation
{
public class VegetationModule : INonSharedRegionModule, IVegetationModule
{
2 Aurora/Modules/World/VersionControlModule/VersionControlModule.cs
View file
@@ -32,7 +32,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.VersionControl
{
public class VersionControlModule : ISharedRegionModule
{
2 Aurora/Modules/World/VistorLogger/VisitorLogger.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.VisitorLogger
{
/// <summary>
/// This module logs all visitors to the sim to a specified file
1,327 Aurora/Modules/World/VivoxVoice/VivoxVoiceModule.cs
View file

Large diffs are not rendered by default.

2 Aurora/Modules/World/Weather/WeatherModule.cs
View file
@@ -25,7 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

namespace Aurora.Modules
namespace Aurora.Modules.Weather
{
/*#region Weather Module
public class WeatherModule : ISharedRegionModule
2 ...es/World/Wind/Plugins/ConfigurableWind.cs → ...es/World/Wind/Plugins/ConfigurableWind.cs
View file
@@ -33,7 +33,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Wind.Plugins
namespace Aurora.Modules.Wind.Plugins
{
public class ConfigurableWind : IWindModelPlugin
{
2 ...es/World/Wind/Plugins/SimpleRandomWind.cs → ...es/World/Wind/Plugins/SimpleRandomWind.cs
View file
@@ -32,7 +32,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules.World.Wind.Plugins
namespace Aurora.Modules.Wind.Plugins
{
public class SimpleRandomWind : IWindModelPlugin
{
2 ...gion/CoreModules/World/Wind/WindModule.cs → Aurora/Modules/World/Wind/WindModule.cs
View file
@@ -33,7 +33,7 @@
using OpenMetaverse;
using OpenSim.Region.Framework.Interfaces;

namespace OpenSim.Region.CoreModules
namespace Aurora.Modules.Wind
{
public class WindModule : IWindModule, INonSharedRegionModule
{
3 Aurora/Modules/World/WindLightSettings/EnvironmentSettingsModule.cs
View file
@@ -4,12 +4,11 @@
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using Aurora.Framework;
using Aurora.Framework.Capabilities;
using Aurora.Framework.Servers.HttpServer;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules.World.WindLightSettings
namespace Aurora.Modules.WindlightSettings
{
public class EnvironmentSettingsModule : INonSharedRegionModule
{
2 Aurora/Modules/World/WindLightSettings/WindLightSettingsModule.cs
View file
@@ -41,7 +41,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Services.Interfaces;

namespace Aurora.Modules
namespace Aurora.Modules.WindlightSettings
{
public class WindLightSettingsModule : INonSharedRegionModule, IWindLightSettingsModule, IAuroraBackupModule
{
2 ...eModules/World/WorldMap/MapImageModule.cs → .../Modules/World/WorldMap/MapImageModule.cs
View file
@@ -40,7 +40,7 @@
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;

namespace OpenSim.Region.CoreModules.World.WorldMap
namespace Aurora.Modules.WorldMap
{
public enum DrawRoutine
{
2 ...s/World/WorldMap/ShadedMapTileRenderer.cs → ...s/World/WorldMap/ShadedMapTileRenderer.cs
View file
@@ -31,7 +31,7 @@
using Nini.Config;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.WorldMap
namespace Aurora.Modules.WorldMap
{
public class ShadedMapTileRenderer : IMapTileTerrainRenderer
{
2 ...World/WorldMap/TexturedMapTileRenderer.cs → ...World/WorldMap/TexturedMapTileRenderer.cs
View file
@@ -36,7 +36,7 @@
using OpenMetaverse.StructuredData;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.World.WorldMap
namespace Aurora.Modules.WorldMap
{
// Hue, Saturation, Value; used for color-interpolation
public struct HSV
2 ...es/World/WorldMap/Warp3DMap/ImageUtils.cs → ...es/World/WorldMap/Warp3DMap/ImageUtils.cs
View file
@@ -30,7 +30,7 @@
using OpenMetaverse;
using WarpRenderer = Warp3D.Warp3D;

namespace OpenSim.Region.CoreModules.World.Warp3DMap
namespace Aurora.Modules.WorldMap.Warp3DMap
{
public static class ImageUtils
{
2 ...odules/World/WorldMap/Warp3DMap/Perlin.cs → ...odules/World/WorldMap/Warp3DMap/Perlin.cs
View file
@@ -28,7 +28,7 @@
using System;
using OpenMetaverse;

namespace OpenSim.Region.CoreModules.World.Warp3DMap
namespace Aurora.Modules.WorldMap.Warp3DMap
{
public static class Perlin
{
2 .../World/WorldMap/Warp3DMap/TerrainSplat.cs → .../World/WorldMap/Warp3DMap/TerrainSplat.cs
View file
@@ -36,7 +36,7 @@
using Aurora.Framework;
using OpenSim.Services.Interfaces;

namespace OpenSim.Region.CoreModules.World.Warp3DMap
namespace Aurora.Modules.WorldMap.Warp3DMap
{
public static class TerrainSplat
{
2 ...ules/World/WorldMap/Warp3DMap/Viewport.cs → ...ules/World/WorldMap/Warp3DMap/Viewport.cs
View file
@@ -29,7 +29,7 @@
using System.Drawing;
using OpenMetaverse;

namespace OpenSim.Region.CoreModules.World.Warp3DMap
namespace Aurora.Modules.WorldMap.Warp3DMap
{
public class Viewport
{
5 ...odules/World/WorldMap/WarpTileRenderer.cs → ...odules/World/WorldMap/WarpTileRenderer.cs
View file
@@ -39,13 +39,12 @@
using OpenMetaverse.Assets;
using OpenMetaverse.Rendering;
using OpenMetaverse.StructuredData;
using Aurora.Framework;
using OpenSim.Region.CoreModules.World.Warp3DMap;
using Aurora.Modules.WorldMap.Warp3DMap;
using Rednettle.Warp3D;
using RegionSettings = Aurora.Framework.RegionSettings;
using WarpRenderer = Warp3D.Warp3D;

namespace OpenSim.Region.CoreModules.World.WorldMap
namespace Aurora.Modules.WorldMap
{
public class WarpTileRenderer : IMapTileTerrainRenderer
{
2 Aurora/Modules/World/Map/WorldMap.cs → Aurora/Modules/World/WorldMap/WorldMap.cs
View file
@@ -41,7 +41,7 @@
using GridRegion = OpenSim.Services.Interfaces.GridRegion;
using System.Timers;

namespace Aurora.Modules
namespace Aurora.Modules.WorldMap
{
public class AuroraWorldMapModule : INonSharedRegionModule, IWorldMapModule
{
2 Aurora/Modules/World/WorldShader/WorldShader.cs
View file
@@ -9,7 +9,7 @@
using Aurora.Framework;
using OpenSim.Region.Framework.Interfaces;

namespace Aurora.Modules.World.WorldShader
namespace Aurora.Modules.WorldShader
{
public class WorldShader : ISharedRegionModule
{
2 Aurora/Physics/AuroraOpenDynamicsEngine/AODEDynamics.cs
View file
@@ -43,7 +43,7 @@
using System.Linq;
using OdeAPI;
using OpenMetaverse;
using OpenSim.Region.Physics.Manager;
using Aurora.Framework.Physics;
//using Ode.NET;

namespace Aurora.Physics.AuroraOpenDynamicsEngine
2 Aurora/Physics/AuroraOpenDynamicsEngine/AODEPrim.cs
View file
@@ -46,7 +46,7 @@
using OdeAPI;
using OpenMetaverse;
using Aurora.Framework;
using OpenSim.Region.Physics.Manager;
using Aurora.Framework.Physics;
//using Ode.NET;

namespace Aurora.Physics.AuroraOpenDynamicsEngine
0 ...hysics/BasicPhysicsPlugin/AssemblyInfo.cs → ...hysics/BasicPhysicsPlugin/AssemblyInfo.cs
View file
File renamed without changes.
0 ...s/BasicPhysicsPlugin/BasicPhysicsActor.cs → ...s/BasicPhysicsPlugin/BasicPhysicsActor.cs
View file
File renamed without changes.
0 .../BasicPhysicsPlugin/BasicPhysicsPlugin.cs → .../BasicPhysicsPlugin/BasicPhysicsPlugin.cs
View file
File renamed without changes.
0 ...s/BasicPhysicsPlugin/BasicPhysicsScene.cs → ...s/BasicPhysicsPlugin/BasicPhysicsScene.cs
View file
File renamed without changes.
0 ...Sim/Region/Physics/Meshing/HelperTypes.cs → Aurora/Physics/Meshing/HelperTypes.cs
View file
File renamed without changes.
0 OpenSim/Region/Physics/Meshing/Mesh.cs → Aurora/Physics/Meshing/Mesh.cs
View file
File renamed without changes.
2 ...Sim/Region/Physics/Meshing/Meshmerizer.cs → Aurora/Physics/Meshing/Meshmerizer.cs
View file
@@ -39,7 +39,7 @@
using OpenMetaverse.Imaging;
using OpenMetaverse.StructuredData;
using Aurora.Framework;
using OpenSim.Region.Physics.Manager;
using Aurora.Framework.Physics;
using PrimMesher;
using Aurora.Framework.Physics;
using zlib;
0 OpenSim/Region/Physics/Meshing/PrimMesher.cs → Aurora/Physics/Meshing/PrimMesher.cs
View file
File renamed without changes.
0 OpenSim/Region/Physics/Meshing/SculptMap.cs → Aurora/Physics/Meshing/SculptMap.cs
View file
File renamed without changes.
0 OpenSim/Region/Physics/Meshing/SculptMesh.cs → Aurora/Physics/Meshing/SculptMesh.cs
View file
File renamed without changes.
0 OpenSim/Region/Physics/Meshing/ZeroMesher.cs → Aurora/Physics/Meshing/ZeroMesher.cs
View file
File renamed without changes.
2 Aurora/Physics/ModifiedBulletSim/BSDynamics.cs
View file
@@ -43,7 +43,7 @@

using System;
using OpenMetaverse;
using OpenSim.Region.Physics.Manager;
using Aurora.Framework.Physics;

namespace OpenSim.Region.Physics.BulletSPlugin
{
2 Aurora/Physics/ModifiedBulletSim/BSPrim.cs
View file
@@ -32,7 +32,7 @@
using OpenMetaverse;
using Aurora.Framework;
using OpenSim.Region.Physics.ConvexDecompositionDotNet;
using OpenSim.Region.Physics.Manager;
using Aurora.Framework.Physics;
using OMV = OpenMetaverse;
using Quaternion = OpenMetaverse.Quaternion;

311 OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View file

This file was deleted.

285 OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View file

This file was deleted.

817 OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View file

This file was deleted.

473 OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View file

This file was deleted.

BIN -207 KB OpenSim/Region/CoreModules/World/Archiver/Tests/Resources/test-sound.wav
View file
Binary file not shown.
119 OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs
View file

This file was deleted.

180 OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
View file

This file was deleted.

10 OpenSim/Region/Framework/Interfaces/IHttpRequests.cs
View file
@@ -26,6 +26,7 @@
*/

using System.Collections.Generic;
using Aurora.Framework;
using OpenMetaverse;

namespace OpenSim.Region.Framework.Interfaces
@@ -50,4 +51,13 @@ public interface IHttpRequestModule
int GetRequestCount();
void RemoveCompletedRequest(IServiceRequest id);
}

public interface IHttpRequestClass : IServiceRequest
{
string Metadata { get; set; }
int Status { get; set; }
UUID PrimID { get; set; }
string ResponseBody { get; set; }
string ReqID { get; set; }
}
}
8 OpenSim/Region/Framework/Interfaces/IXMLRPC.cs
View file
@@ -45,6 +45,14 @@ public interface IXmlRpcRequestInfo
UUID GetMessageID();
}

public interface ISendRemoteDataRequest : IServiceRequest
{
UUID GetReqID();
string Channel { get; set; }
int Idata { get; set; }
string Sdata { get; set; }
}

public interface IXMLRPC
{
int Port { get; }
1 OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs
View file
@@ -26,6 +26,7 @@
*/

using OpenMetaverse;
using Aurora.Framework;

namespace OpenSim.Region.Framework.Interfaces
{
58 OpenSim/Region/Physics/Manager/AssemblyInfo.cs
View file

This file was deleted.

2 ...ion/CoreModules/Asset/CenomeAssetCache.cs → ...ces/AssetCacheService/CenomeAssetCache.cs
View file
@@ -31,7 +31,7 @@
using Nini.Config;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.Asset
namespace OpenSim.Services
{
/// <summary>
/// Cenome memory asset cache.
2 ...on/CoreModules/Asset/FlotsamAssetCache.cs → ...es/AssetCacheService/FlotsamAssetCache.cs
View file
@@ -43,7 +43,7 @@
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;

namespace Flotsam.RegionModules.AssetCache
namespace OpenSim.Services
{
public class FlotsamAssetCache : IService, IImprovedAssetCache
{
2 ...oreModules/Asset/GlynnTuckerAssetCache.cs → ...ssetCacheService/GlynnTuckerAssetCache.cs
View file
@@ -32,7 +32,7 @@
using Nini.Config;
using Aurora.Framework;

namespace OpenSim.Region.CoreModules.Asset
namespace OpenSim.Services
{
public class GlynnTuckerAssetCache : IService, IImprovedAssetCache
{