aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Estate
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs)6
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs (renamed from OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs)2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 6b74c83..8b15308 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework;
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.World.Estate 38namespace OpenSim.Region.CoreModules.World.Estate
39{ 39{
40 public class EstateManagementModule : IEstateModule 40 public class EstateManagementModule : IEstateModule
41 { 41 {
@@ -458,7 +458,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
458 TerrainUploader = null; 458 TerrainUploader = null;
459 } 459 }
460 remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); 460 remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
461 OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>(); 461 OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
462 462
463 if (terr != null) 463 if (terr != null)
464 { 464 {
@@ -544,7 +544,7 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
544 private void handleTerrainRequest(IClientAPI remote_client, string clientFileName) 544 private void handleTerrainRequest(IClientAPI remote_client, string clientFileName)
545 { 545 {
546 // Save terrain here 546 // Save terrain here
547 OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.World.Terrain.ITerrainModule>(); 547 OpenSim.Region.CoreModules.World.Terrain.ITerrainModule terr = m_scene.RequestModuleInterface<OpenSim.Region.CoreModules.World.Terrain.ITerrainModule>();
548 548
549 if (terr != null) 549 if (terr != null)
550 { 550 {
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
index 267178e..94a4072 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateTerrainXferHandler.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateTerrainXferHandler.cs
@@ -35,7 +35,7 @@ using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36 36
37 37
38namespace OpenSim.Region.Environment.Modules.World.Estate 38namespace OpenSim.Region.CoreModules.World.Estate
39{ 39{
40 40
41 public class EstateTerrainXferHandler 41 public class EstateTerrainXferHandler