aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index de1517b..753effc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1632,8 +1632,15 @@ namespace OpenSim.Region.Framework.Scenes
1632 double[,] map = SimulationDataService.LoadTerrain(RegionInfo.RegionID); 1632 double[,] map = SimulationDataService.LoadTerrain(RegionInfo.RegionID);
1633 if (map == null) 1633 if (map == null)
1634 { 1634 {
1635 m_log.Info("[TERRAIN]: No default terrain. Generating a new terrain."); 1635 // This should be in the Terrain module, but it isn't because
1636 Heightmap = new TerrainChannel(); 1636 // the heightmap is needed _way_ before the modules are initialized...
1637 IConfig terrainConfig = m_config.Configs["Terrain"];
1638 String m_InitialTerrain = "pinhead-island";
1639 if (terrainConfig != null)
1640 m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain);
1641
1642 m_log.InfoFormat("[TERRAIN]: No default terrain. Generating a new terrain {0}.", m_InitialTerrain);
1643 Heightmap = new TerrainChannel(m_InitialTerrain);
1637 1644
1638 SimulationDataService.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); 1645 SimulationDataService.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
1639 } 1646 }
@@ -2894,7 +2901,6 @@ namespace OpenSim.Region.Framework.Scenes
2894 { 2901 {
2895 //client.OnNameFromUUIDRequest += HandleUUIDNameRequest; 2902 //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
2896 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest; 2903 client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
2897 client.OnAvatarPickerRequest += ProcessAvatarPickerRequest;
2898 client.OnSetStartLocationRequest += SetHomeRezPoint; 2904 client.OnSetStartLocationRequest += SetHomeRezPoint;
2899 client.OnRegionHandleRequest += RegionHandleRequest; 2905 client.OnRegionHandleRequest += RegionHandleRequest;
2900 } 2906 }
@@ -3022,7 +3028,6 @@ namespace OpenSim.Region.Framework.Scenes
3022 { 3028 {
3023 //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest; 3029 //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
3024 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest; 3030 client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
3025 client.OnAvatarPickerRequest -= ProcessAvatarPickerRequest;
3026 client.OnSetStartLocationRequest -= SetHomeRezPoint; 3031 client.OnSetStartLocationRequest -= SetHomeRezPoint;
3027 client.OnRegionHandleRequest -= RegionHandleRequest; 3032 client.OnRegionHandleRequest -= RegionHandleRequest;
3028 } 3033 }
@@ -3693,9 +3698,9 @@ namespace OpenSim.Region.Framework.Scenes
3693 if (!AuthorizationService.IsAuthorizedForRegion( 3698 if (!AuthorizationService.IsAuthorizedForRegion(
3694 agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason)) 3699 agent.AgentID.ToString(), agent.firstname, agent.lastname, RegionInfo.RegionID.ToString(), out reason))
3695 { 3700 {
3696 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", 3701 m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because {4}",
3697 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); 3702 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName, reason);
3698 3703
3699 return false; 3704 return false;
3700 } 3705 }
3701 } 3706 }