diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs (renamed from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs (renamed from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs (renamed from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs (renamed from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs (renamed from OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs (renamed from OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs (renamed from OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 024c910..b9a0a64 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; | |||
38 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; | 38 | using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; |
39 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; | 39 | using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; |
40 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | 40 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; |
41 | using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; | 41 | using OpenSim.Region.CoreModules.Agent.AssetTransaction; |
42 | 42 | ||
43 | namespace OpenSim.ApplicationPlugins.LoadRegions | 43 | namespace OpenSim.ApplicationPlugins.LoadRegions |
44 | { | 44 | { |
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 57c6fa3..f85c9dd 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim | |||
146 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); | 146 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); |
147 | } | 147 | } |
148 | 148 | ||
149 | public void RunCommand(string module, string[] cp) | 149 | void RunCommand(string module, string[] cp) |
150 | { | 150 | { |
151 | List<string> cmdparams = new List<string>(cp); | 151 | List<string> cmdparams = new List<string>(cp); |
152 | if (cmdparams.Count < 1) | 152 | if (cmdparams.Count < 1) |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index 82325b7..2be1eaa 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using OpenSim.Region.Framework.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | 36 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction |
37 | { | 37 | { |
38 | /* | 38 | /* |
39 | public class AgentAssetTransactionsManager | 39 | public class AgentAssetTransactionsManager |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index adfbbad..b4dbaa1 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | |||
@@ -32,7 +32,7 @@ using OpenSim.Framework; | |||
32 | using OpenSim.Region.Framework.Scenes; | 32 | using OpenSim.Region.Framework.Scenes; |
33 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | 35 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Manage asset transactions for a single agent. | 38 | /// Manage asset transactions for a single agent. |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index 1eb6795..77dfd44 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | 36 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction |
37 | { | 37 | { |
38 | public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions | 38 | public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions |
39 | { | 39 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index e1e1065..aef2664 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework; | |||
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | 38 | namespace OpenSim.Region.CoreModules.Agent.AssetTransaction |
39 | { | 39 | { |
40 | public class AssetXferUploader | 40 | public class AssetXferUploader |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 861e9f4..4f7f177 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | |||
@@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 39 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; |
40 | 40 | ||
41 | namespace OpenSim.Region.Environment.Modules.Agent.Capabilities | 41 | namespace OpenSim.Region.CoreModules.Agent.Capabilities |
42 | { | 42 | { |
43 | public class CapabilitiesModule : IRegionModule, ICapabilitiesModule | 43 | public class CapabilitiesModule : IRegionModule, ICapabilitiesModule |
44 | { | 44 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs index 4790295..107855d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Scenes; | |||
36 | using OpenSim.Framework.Communications.Cache; | 36 | using OpenSim.Framework.Communications.Cache; |
37 | using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; | 37 | using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; |
38 | 38 | ||
39 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | 39 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload |
40 | { | 40 | { |
41 | public class TextureDownloadModule : IRegionModule | 41 | public class TextureDownloadModule : IRegionModule |
42 | { | 42 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs index 51aa48e..7309282 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs | |||
@@ -32,7 +32,7 @@ using OpenMetaverse.Packets; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | 35 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// Sends a 'texture not found' packet back to the client | 38 | /// Sends a 'texture not found' packet back to the client |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index 38d96db..675bb0f 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs | |||
@@ -35,7 +35,7 @@ using OpenSim.Framework.Statistics; | |||
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | 37 | ||
38 | namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | 38 | namespace OpenSim.Region.CoreModules.Agent.TextureDownload |
39 | { | 39 | { |
40 | /// <summary> | 40 | /// <summary> |
41 | /// This module sets up texture senders in response to client texture requests, and places them on a | 41 | /// This module sets up texture senders in response to client texture requests, and places them on a |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 8524592..df672b8 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Framework; | |||
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | 41 | ||
42 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | 42 | namespace OpenSim.Region.CoreModules.Agent.TextureSender |
43 | { | 43 | { |
44 | public class J2KDecoderModule : IRegionModule, IJ2KDecoder | 44 | public class J2KDecoderModule : IRegionModule, IJ2KDecoder |
45 | { | 45 | { |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs index cfac868..f0587bb 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs | |||
@@ -33,7 +33,7 @@ using OpenMetaverse; | |||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Tests.Common.Mock; | 34 | using OpenSim.Tests.Common.Mock; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | 36 | namespace OpenSim.Region.CoreModules.Agent.TextureSender |
37 | { | 37 | { |
38 | [TestFixture] | 38 | [TestFixture] |
39 | public class UserTextureSenderTests | 39 | public class UserTextureSenderTests |
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs index 7d7efda..b3ac624 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs | |||
@@ -32,7 +32,7 @@ using log4net; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | 34 | ||
35 | namespace OpenSim.Region.Environment.Modules.Agent.TextureSender | 35 | namespace OpenSim.Region.CoreModules.Agent.TextureSender |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
38 | /// A TextureSender handles the process of receiving a texture requested by the client from the | 38 | /// A TextureSender handles the process of receiving a texture requested by the client from the |
diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs index 1d18b4b..cb81c0d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs | |||
@@ -33,7 +33,7 @@ using OpenSim.Framework; | |||
33 | using OpenSim.Region.Framework.Interfaces; | 33 | using OpenSim.Region.Framework.Interfaces; |
34 | using OpenSim.Region.Framework.Scenes; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | 35 | ||
36 | namespace OpenSim.Region.Environment.Modules.Agent.Xfer | 36 | namespace OpenSim.Region.CoreModules.Agent.Xfer |
37 | { | 37 | { |
38 | public class XferModule : IRegionModule, IXfer | 38 | public class XferModule : IRegionModule, IXfer |
39 | { | 39 | { |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 5540141..3a0f72a 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Region.Physics.Manager; | |||
36 | using OpenSim.Region.Framework; | 36 | using OpenSim.Region.Framework; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Environment.Modules.Agent.Capabilities; | 39 | using OpenSim.Region.CoreModules.Agent.Capabilities; |
40 | using OpenSim.Tests.Common.Mock; | 40 | using OpenSim.Tests.Common.Mock; |
41 | 41 | ||
42 | namespace OpenSim.Tests.Common.Setup | 42 | namespace OpenSim.Tests.Common.Setup |