aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Interfaces/IHttpRequests.cs2
-rw-r--r--OpenSim/Region/Environment/Interfaces/IWorldComm.cs2
-rw-r--r--OpenSim/Region/Environment/Interfaces/IXMLRPC.cs2
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
5 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
index 39d5564..46ba9b2 100644
--- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
+++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs
@@ -27,7 +27,7 @@
27 27
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
index 6dd5d81..8a63c54 100644
--- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs
@@ -27,7 +27,7 @@
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Modules; 30using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
31 31
32namespace OpenSim.Region.Environment.Interfaces 32namespace OpenSim.Region.Environment.Interfaces
33{ 33{
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
index c7f1001..6c1d025 100644
--- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
+++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Region.Environment.Modules; 29using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
30 30
31namespace OpenSim.Region.Environment.Interfaces 31namespace OpenSim.Region.Environment.Interfaces
32{ 32{
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 52a6fbd..b34e126 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -32,7 +32,13 @@ using System.Reflection;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Environment.Interfaces;
35using OpenSim.Region.Environment.Modules; 35//TODO: Why do we reference InstantMessageModule here?
36using OpenSim.Region.Environment.Modules.Agent.AssetTransaction;
37using OpenSim.Region.Environment.Modules.Avatar.Chat;
38using OpenSim.Region.Environment.Modules.Avatar.InstantMessage;
39using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture;
40using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL;
41using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
36using OpenSim.Region.Environment.Scenes; 42using OpenSim.Region.Environment.Scenes;
37 43
38namespace OpenSim.Region.Environment 44namespace OpenSim.Region.Environment
@@ -139,7 +145,7 @@ namespace OpenSim.Region.Environment
139 145
140 //LoadedSharedModules.Add(textureModule.Name, textureModule); 146 //LoadedSharedModules.Add(textureModule.Name, textureModule);
141 147
142 AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); 148 AssetTransactionModule transactionsModule = new AssetTransactionModule();
143 if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) 149 if (m_loadedSharedModules.ContainsKey(transactionsModule.Name))
144 { 150 {
145 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); 151 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index de4270f..4a80b8d 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40using OpenSim.Framework.Communications.Cache;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Region.Environment.Interfaces; 42using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.Terrain; 43using OpenSim.Region.Environment.Modules.World.Terrain;
44using OpenSim.Region.Environment.Scenes.Scripting; 44using OpenSim.Region.Environment.Scenes.Scripting;
45using OpenSim.Region.Physics.Manager; 45using OpenSim.Region.Physics.Manager;
46using Caps=OpenSim.Region.Capabilities.Caps; 46using Caps=OpenSim.Region.Capabilities.Caps;