aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs2
-rw-r--r--OpenSim/Region/Application/HGOpenSimNode.cs2
-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.cs2
-rw-r--r--prebuild.xml48
16 files changed, 63 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;
38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; 38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; 39using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 40using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
41using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; 41using OpenSim.Region.CoreModules.Agent.AssetTransaction;
42 42
43namespace OpenSim.ApplicationPlugins.LoadRegions 43namespace 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;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 36namespace 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;
32using OpenSim.Region.Framework.Scenes; 32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 35namespace 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;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 36namespace 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;
35using OpenSim.Framework.Communications.Cache; 35using OpenSim.Framework.Communications.Cache;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction 38namespace 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;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using Caps = OpenSim.Framework.Communications.Capabilities.Caps; 39using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
40 40
41namespace OpenSim.Region.Environment.Modules.Agent.Capabilities 41namespace 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;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; 37using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
38 38
39namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 39namespace 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;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 35namespace 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;
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 38namespace 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;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
41 41
42namespace OpenSim.Region.Environment.Modules.Agent.TextureSender 42namespace 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;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Tests.Common.Mock; 34using OpenSim.Tests.Common.Mock;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.TextureSender 36namespace 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;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34 34
35namespace OpenSim.Region.Environment.Modules.Agent.TextureSender 35namespace 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;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35 35
36namespace OpenSim.Region.Environment.Modules.Agent.Xfer 36namespace 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;
36using OpenSim.Region.Framework; 36using OpenSim.Region.Framework;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Environment.Modules.Agent.Capabilities; 39using OpenSim.Region.CoreModules.Agent.Capabilities;
40using OpenSim.Tests.Common.Mock; 40using OpenSim.Tests.Common.Mock;
41 41
42namespace OpenSim.Tests.Common.Setup 42namespace OpenSim.Tests.Common.Setup
diff --git a/prebuild.xml b/prebuild.xml
index a6fe84f..8031b46 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -842,6 +842,52 @@
842 </Files> 842 </Files>
843 </Project> 843 </Project>
844 844
845 <Project name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
846 <Configuration name="Debug">
847 <Options>
848 <OutputPath>../../../bin/</OutputPath>
849 </Options>
850 </Configuration>
851 <Configuration name="Release">
852 <Options>
853 <OutputPath>../../../bin/</OutputPath>
854 </Options>
855 </Configuration>
856
857 <ReferencePath>../../../bin/</ReferencePath>
858 <Reference name="System" localCopy="false"/>
859 <Reference name="System.Xml"/>
860 <Reference name="System.Drawing"/>
861 <Reference name="System.Runtime.Remoting"/>
862 <Reference name="System.Web"/>
863 <Reference name="OpenMetaverseTypes.dll"/>
864 <Reference name="OpenMetaverse.StructuredData.dll"/>
865 <Reference name="OpenMetaverse.dll"/>
866 <Reference name="OpenSim.Framework"/>
867 <Reference name="OpenSim.Framework.Communications"/>
868 <Reference name="OpenSim.Data" />
869 <Reference name="OpenSim.Region.Framework" />
870 <Reference name="OpenSim.Framework.Console"/>
871 <Reference name="OpenSim.Framework.Servers"/>
872 <Reference name="OpenSim.Framework.Statistics"/>
873 <Reference name="OpenSim.Region.Physics.Manager"/>
874 <Reference name="OpenSim.Grid.AssetServer"/>
875
876 <!-- For scripting in funny languages by default -->
877 <Reference name="Microsoft.JScript"/>
878 <Reference name="XMLRPC.dll"/>
879 <Reference name="OpenSim.Framework.Communications"/>
880 <Reference name="Nini.dll" />
881 <Reference name="log4net.dll"/>
882 <Reference name="DotNetOpenMail.dll"/>
883
884 <Files>
885 <Match pattern="*.cs" recurse="true">
886 <Exclude name="Tests" pattern="Tests" />
887 </Match>
888 </Files>
889 </Project>
890
845 <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Environment" type="Library"> 891 <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Environment" type="Library">
846 <Configuration name="Debug"> 892 <Configuration name="Debug">
847 <Options> 893 <Options>
@@ -1162,6 +1208,7 @@
1162 <Reference name="Nini.dll" /> 1208 <Reference name="Nini.dll" />
1163 <Reference name="OpenSim"/> 1209 <Reference name="OpenSim"/>
1164 <Reference name="OpenSim.Region.ClientStack"/> 1210 <Reference name="OpenSim.Region.ClientStack"/>
1211 <Reference name="OpenSim.Region.CoreModules"/>
1165 <Reference name="OpenSim.Region.Environment"/> 1212 <Reference name="OpenSim.Region.Environment"/>
1166 <Reference name="OpenSim.Region.Framework"/> 1213 <Reference name="OpenSim.Region.Framework"/>
1167 <Reference name="OpenSim.Framework"/> 1214 <Reference name="OpenSim.Framework"/>
@@ -2326,6 +2373,7 @@
2326 <Reference name="OpenSim.Data"/> 2373 <Reference name="OpenSim.Data"/>
2327 <Reference name="OpenSim.Region.Communications.Local"/> 2374 <Reference name="OpenSim.Region.Communications.Local"/>
2328 <Reference name="OpenSim.Region.Framework"/> 2375 <Reference name="OpenSim.Region.Framework"/>
2376 <Reference name="OpenSim.Region.CoreModules"/>
2329 <Reference name="OpenSim.Region.Environment"/> 2377 <Reference name="OpenSim.Region.Environment"/>
2330 <Reference name="OpenSim.Region.Physics.Manager"/> 2378 <Reference name="OpenSim.Region.Physics.Manager"/>
2331 2379